summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-03-09 20:11:25 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-03-09 22:10:54 -0400
commitd92f98b4f6750419e40642f647e2c7ce4a9528ed (patch)
tree2707204d7e2e73e62360a1b12453038deac612b9 /src
parent6410074b4f8f06a7fce32fa200f6c9f5d97fec45 (diff)
bootchart: use _cleanup_
Diffstat (limited to 'src')
-rw-r--r--src/bootchart/bootchart.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 607ec42690..158f8a908c 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -268,10 +268,11 @@ static int parse_argv(int argc, char *argv[]) {
static void do_journal_append(char *file) {
struct iovec iovec[5];
- int r, f, j = 0;
+ int r, j = 0;
ssize_t n;
_cleanup_free_ char *bootchart_file = NULL, *bootchart_message = NULL,
*p = NULL;
+ _cleanup_close_ fd = -1;
bootchart_file = strappend("BOOTCHART_FILE=", file);
if (bootchart_file)
@@ -291,18 +292,17 @@ static void do_journal_append(char *file) {
memcpy(p, "BOOTCHART=", 10);
- f = open(file, O_RDONLY|O_CLOEXEC);
- if (f < 0) {
- log_error_errno(errno, "Failed to read bootchart data: %m");
+ fd = open(file, O_RDONLY|O_CLOEXEC);
+ if (fd < 0) {
+ log_error_errno(errno, "Failed to open bootchart data \"%s\": %m", file);
return;
}
- n = loop_read(f, p + 10, BOOTCHART_MAX, false);
+
+ n = loop_read(fd, p + 10, BOOTCHART_MAX, false);
if (n < 0) {
log_error_errno(n, "Failed to read bootchart data: %m");
- close(f);
return;
}
- close(f);
iovec[j].iov_base = p;
iovec[j].iov_len = 10 + n;