From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Oct 2015 20:37:53 +0000 (+0200)
Subject: journal: prefer stack allocation
X-Git-Tag: v227~26^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84267e4043cf88bf540b5bf9cd65e194670a4ffa;p=thirdparty%2Fsystemd.git

journal: prefer stack allocation
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 50e9b08da92..3538ddc13f2 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -926,7 +926,7 @@ finish:
 
 static int system_journal_open(Server *s, bool flush_requested) {
         int r;
-        char *fn;
+        const char *fn;
         sd_id128_t machine;
         char ids[33];
 
@@ -969,9 +969,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
         if (!s->runtime_journal &&
             (s->storage != STORAGE_NONE)) {
 
-                fn = strjoin("/run/log/journal/", ids, "/system.journal", NULL);
-                if (!fn)
-                        return -ENOMEM;
+                fn = strjoina("/run/log/journal/", ids, "/system.journal", NULL);
 
                 if (s->system_journal) {
 
@@ -980,8 +978,6 @@ static int system_journal_open(Server *s, bool flush_requested) {
                          * it into the system journal */
 
                         r = journal_file_open(fn, O_RDWR, 0640, s->compress, false, &s->runtime_metrics, s->mmap, NULL, &s->runtime_journal);
-                        free(fn);
-
                         if (r < 0) {
                                 if (r != -ENOENT)
                                         log_warning_errno(r, "Failed to open runtime journal: %m");
@@ -999,8 +995,6 @@ static int system_journal_open(Server *s, bool flush_requested) {
                         (void) mkdir_parents(fn, 0750);
 
                         r = journal_file_open_reliably(fn, O_RDWR|O_CREAT, 0640, s->compress, false, &s->runtime_metrics, s->mmap, NULL, &s->runtime_journal);
-                        free(fn);
-
                         if (r < 0)
                                 return log_error_errno(r, "Failed to open runtime journal: %m");
                 }