summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-10 19:51:47 +0000
committerLennart Poettering <lennart@poettering.net>2013-12-10 19:51:47 +0000
commit14c1025934e709d07948c13ca62b40c35c91d111 (patch)
tree80b4467eaa8d1e7c367ccfb7694e554e3766ac0c /src/journal
parent35460afc4896b22b0df743b70003e8768d78111a (diff)
journald: use a bit more cleanup magic!
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journald-stream.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 091f59de17..42a846b8ea 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;
}