From fb4729006a7174472e8a435b0887e532cd6217fc Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 15 Feb 2014 18:10:36 -0500
Subject: Some modernizations

---
 src/journal/journald-console.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 04c4424a46..35da52af2a 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -55,7 +55,7 @@ void server_forward_console(
         struct timespec ts;
         char tbuf[4 + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
         int n = 0, fd;
-        char *ident_buf = NULL;
+        _cleanup_free_ char *ident_buf = NULL;
         const char *tty;
 
         assert(s);
@@ -101,14 +101,11 @@ void server_forward_console(
         fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC);
         if (fd < 0) {
                 log_debug("Failed to open %s for logging: %m", tty);
-                goto finish;
+                return;
         }
 
         if (writev(fd, iovec, n) < 0)
                 log_debug("Failed to write to %s for logging: %m", tty);
 
         close_nointr_nofail(fd);
-
-finish:
-        free(ident_buf);
 }
-- 
cgit v1.2.3-54-g00ecf