diff options
| -rw-r--r-- | src/bootchart/bootchart.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 607ec4269..158f8a908 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; |