From 0ea9530d401827e299c6e04a433e69a7a2a89d80 Mon Sep 17 00:00:00 2001
From: Nathaniel Chen <nathaniel.chen@intel.com>
Date: Thu, 7 Mar 2013 11:09:16 -0800
Subject: bootchart: use _cleanup_close_

use _cleanup_{close_,fclose_} to close streams and file descriptors
---
 src/bootchart/svg.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/bootchart/svg.c')

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 9fee810795..79476716a6 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -150,7 +150,7 @@ static void svg_title(const char *build)
         char date[256] = "Unknown";
         char cpu[256] = "Unknown";
         char *c;
-        FILE *f;
+        FILE _cleanup_fclose_ *f = NULL;
         time_t t;
         int fd;
         struct utsname uts;
@@ -161,7 +161,6 @@ static void svg_title(const char *build)
         if (f) {
                 if (!fgets(cmdline, 255, f))
                         sprintf(cmdline, "Unknown");
-                fclose(f);
         }
 
         /* extract root fs so we can find disk model name in sysfs */
@@ -176,7 +175,6 @@ static void svg_title(const char *build)
                 if (f) {
                         if (!fgets(model, 255, f))
                                 fprintf(stderr, "Error reading disk model for %s\n", rootbdev);
-                        fclose(f);
                 }
         }
 
@@ -198,7 +196,6 @@ static void svg_title(const char *build)
                                 break;
                         }
                 }
-                fclose(f);
         }
 
         svg("<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",
-- 
cgit v1.2.3-54-g00ecf