shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-10 17:57:40 +03:00
Code

Merge pull request #2769 from martinpitt/adjtime

Browse Source 
Fixes for adjtime parsing
This commit is contained in:
Lennart Poettering 2016-02-29 20:32:02 +01:00
commit ecb7c4488e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/test-clock.c
View File

@ -28,8 +28,8 @@
static void test_clock_is_localtime(void) {
char adjtime[] = "/tmp/test-adjtime.XXXXXX";
_cleanup_close_ int fd = -1;
FILE* f;
int fd = -1;
_cleanup_fclose_ FILE* f = NULL;
static const struct scenario {
const char* contents;
@ -56,10 +56,10 @@ static void test_clock_is_localtime(void) {
assert_se(clock_is_localtime("/nonexisting/adjtime") == 0);
fd = mkostemp_safe(adjtime, O_WRONLY|O_CLOEXEC);
assert(fd > 0);
assert_se(fd >= 0);
log_info("adjtime test file: %s", adjtime);
f = fdopen(fd, "w");
assert(f);
assert_se(f);
for (size_t i = 0; i < ELEMENTSOF(scenarios); ++i) {
log_info("scenario #%zu:, expected result %i", i, scenarios[i].expected_result);
@ -82,10 +82,10 @@ static void test_clock_is_localtime_system(void) {
log_info("/etc/adjtime exists, clock_is_localtime() == %i", r);
/* if /etc/adjtime exists we expect some answer, no error or
* crash */
assert(r == 0 || r == 1);
assert_se(r == 0 || r == 1);
} else
/* default is UTC if there is no /etc/adjtime */
assert(r == 0);
assert_se(r == 0);
}
int main(int argc, char *argv[]) {

4
src/timedate/timedated.c
View File

@ -131,10 +131,10 @@ static int context_write_data_local_rtc(Context *c) {
size_t a, b;
p = strchrnul(s, '\n');
if (*p == '\0') {
if (*p == '\0')
/* only one line, no \n terminator */
prepend = "\n0\n";
} else if (p[1] == '\0') {
else if (p[1] == '\0') {
/* only one line, with \n terminator */
++p;
prepend = "0\n";