From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 11 Apr 2013 23:02:37 +0000 (-0400)
Subject: hwclock: use _cleanup_ to simplify function
X-Git-Tag: v202~139
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8e2f9ebf28f93241ed36469302e76de498aa8e87;p=elogind.git

hwclock: use _cleanup_ to simplify function
---

diff --git a/src/shared/hwclock.c b/src/shared/hwclock.c
index 55b0fa8a0..9076d8ffc 100644
--- a/src/shared/hwclock.c
+++ b/src/shared/hwclock.c
@@ -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) {