picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hwclock: use _cleanup_ to simplify function

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-04-11 19:02:37 -04:00
parent bcb161b023
commit 8e2f9ebf28
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/shared/hwclock.c
View file

@ -163,8 +163,7 @@ int hwclock_set_time(const struct tm *tm) {
}
int hwclock_is_localtime(void) {
FILE *f;
bool local = false;
FILE _cleanup_fclose_ *f;
/*
* The third line of adjtime is "UTC" or "LOCAL" or nothing.
@ -181,19 +180,16 @@ int hwclock_is_localtime(void) {
b = fgets(line, sizeof(line), f) &&
fgets(line, sizeof(line), f) &&
fgets(line, sizeof(line), f);
fclose(f);
if (!b)
return -EIO;
truncate_nl(line);
local = streq(line, "LOCAL");
return streq(line, "LOCAL");
} else if (errno != ENOENT)
return -errno;
return local;
return 0;
}
int hwclock_set_timezone(int *min) {