uptime plugin: Coding style update.

This is only touching the Linux code, though.

diff --git a/src/uptime.c b/src/uptime.c
index ed0dfd10ffd1f4d500be6f52b3612b6709a2e2f4..8b83cf9be9f7def6ebc15bec94d912f5cbe14000 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -86,14 +86,7 @@ static int uptime_init(void) /* {{{ */
  */
 
 #if KERNEL_LINUX
-  double uptime_seconds;
-  int ret;
-  FILE *fh;
-
-  ret = 0;
-
-  fh = fopen(UPTIME_FILE, "r");
-
+  FILE *fh = fopen(UPTIME_FILE, "r");
   if (fh == NULL) {
     char errbuf[1024];
     ERROR("uptime plugin: Cannot open " UPTIME_FILE ": %s",
@@ -101,16 +94,15 @@ static int uptime_init(void) /* {{{ */
     return -1;
   }
 
-  ret = fscanf(fh, "%lf", &uptime_seconds);
-
-  fclose(fh);
-
-  /* loop done, check if no value has been found/read */
-  if (ret != 1) {
+  double uptime_seconds = 0.0;
+  if (fscanf(fh, "%lf", &uptime_seconds) != 1) {
     ERROR("uptime plugin: No value read from " UPTIME_FILE "");
+    fclose(fh);
     return -1;
   }
 
+  fclose(fh);
+
   if (uptime_seconds == 0.0) {
     ERROR("uptime plugin: uptime read from " UPTIME_FILE ", "
           "but it is zero!");