chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootchart: use _cleanup_close_
[elogind.git]
/
src
/
bootchart
/
svg.c
diff --git
a/src/bootchart/svg.c
b/src/bootchart/svg.c
index 9fee810795b30afb471d4a6fc40a54cba622aed1..79476716a6bfe20563c9c06486c7043d0acc004b 100644
(file)
--- 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;
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;
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");
if (f) {
if (!fgets(cmdline, 255, f))
sprintf(cmdline, "Unknown");
- fclose(f);
}
/* extract root fs so we can find disk model name in sysfs */
}
/* 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);
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;
}
}
break;
}
}
- fclose(f);
}
svg("<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",
}
svg("<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",