From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 Dec 2013 19:51:47 +0000 (+0000)
Subject: journald: use a bit more cleanup magic!
X-Git-Tag: v209~1047
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=14c1025934e709d07948c13ca62b40c35c91d111;p=elogind.git

journald: use a bit more cleanup magic!
---

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 091f59de1..42a846b8e 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -76,7 +76,7 @@ struct StdoutStream {
 
 static int stdout_stream_log(StdoutStream *s, const char *p) {
         struct iovec iovec[N_IOVEC_META_FIELDS + 5];
-        char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
+        _cleanup_free_ char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
         unsigned n = 0;
         int priority;
         char *label = NULL;
@@ -129,12 +129,6 @@ static int stdout_stream_log(StdoutStream *s, const char *p) {
 #endif
 
         server_dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, label, label_len, s->unit_id, priority, 0);
-
-        free(message);
-        free(syslog_priority);
-        free(syslog_facility);
-        free(syslog_identifier);
-
         return 0;
 }