move _cleanup_ attribute in front of the type

[elogind.git] / src / bootchart / bootchart.c

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index d6c63cd1297c9c3ea872df82cdc5096654c11297..002f3df8b62059dc92aacccf04a8289d980c5acd 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -123,7 +123,7 @@ static void parse_conf(void) {
         if (!f)
                 return;
 
-        r = config_parse(BOOTCHART_CONF, f,
+        r = config_parse(NULL, BOOTCHART_CONF, f,
                          NULL, config_item_table_lookup, (void*) items, true, NULL);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
@@ -245,7 +245,7 @@ static void do_journal_append(char *file)
         struct iovec iovec[5];
         int r, f, j = 0;
         ssize_t n;
-        char _cleanup_free_ *bootchart_file = NULL, *bootchart_message = NULL,
+        _cleanup_free_ char *bootchart_file = NULL, *bootchart_message = NULL,
                 *p = NULL;
 
         bootchart_file = strappend("BOOTCHART_FILE=", file);
@@ -268,7 +268,7 @@ static void do_journal_append(char *file)
 
         f = open(file, O_RDONLY);
         if (f < 0) {
-                log_error("Failed to read bootchart data: %s\n", strerror(-errno));
+                log_error("Failed to read bootchart data: %m\n");
                 return;
         }
         n = loop_read(f, p + 10, BOOTCHART_MAX, false);