|
 |
a52f674 |
From d690f32eeba37f3598b8dfdb564f26559d4e39a2 Mon Sep 17 00:00:00 2001
|
|
|
b12ff75 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
b12ff75 |
Date: Tue, 10 Dec 2013 19:51:47 +0000
|
|
|
b12ff75 |
Subject: [PATCH] journald: use a bit more cleanup magic!
|
|
|
b12ff75 |
|
|
|
a52f674 |
(cherry picked from commit 14c1025934e709d07948c13ca62b40c35c91d111)
|
|
|
b12ff75 |
---
|
|
|
b12ff75 |
src/journal/journald-stream.c | 8 +-------
|
|
|
b12ff75 |
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
|
|
|
1cc3df3 |
index 4080622c48..771a2bd832 100644
|
|
|
b12ff75 |
--- a/src/journal/journald-stream.c
|
|
|
b12ff75 |
+++ b/src/journal/journald-stream.c
|
|
|
b12ff75 |
@@ -75,7 +75,7 @@ struct StdoutStream {
|
|
|
b12ff75 |
|
|
|
b12ff75 |
static int stdout_stream_log(StdoutStream *s, const char *p) {
|
|
|
b12ff75 |
struct iovec iovec[N_IOVEC_META_FIELDS + 5];
|
|
|
b12ff75 |
- char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
|
|
|
b12ff75 |
+ _cleanup_free_ char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
|
|
|
b12ff75 |
unsigned n = 0;
|
|
|
b12ff75 |
int priority;
|
|
|
b12ff75 |
char *label = NULL;
|
|
|
b12ff75 |
@@ -128,12 +128,6 @@ static int stdout_stream_log(StdoutStream *s, const char *p) {
|
|
|
b12ff75 |
#endif
|
|
|
b12ff75 |
|
|
|
b12ff75 |
server_dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, label, label_len, s->unit_id, priority, 0);
|
|
|
b12ff75 |
-
|
|
|
b12ff75 |
- free(message);
|
|
|
b12ff75 |
- free(syslog_priority);
|
|
|
b12ff75 |
- free(syslog_facility);
|
|
|
b12ff75 |
- free(syslog_identifier);
|
|
|
b12ff75 |
-
|
|
|
b12ff75 |
return 0;
|
|
|
b12ff75 |
}
|
|
|
b12ff75 |
|