[systemd-commits] src/core src/journal

[Zbigniew Jędrzejewski-Szmek]

 src/core/load-fragment.c      |    4 ++--
 src/journal/journald-server.c |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 8a7935a23bfec14beb73e004beb01273254cf789
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Sep 27 07:58:57 2013 +0200

    Do not use unitialized variable and remove duplicated line

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 70ea13a..44920d6 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1788,7 +1788,6 @@ int config_parse_unit_requires_mounts_for(
         char *state;
         size_t l;
         char *w;
-        int r;
 
         assert(filename);
         assert(lvalue);
@@ -1796,6 +1795,7 @@ int config_parse_unit_requires_mounts_for(
         assert(data);
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+                int r;
                 _cleanup_free_ char *n;
 
                 n = strndup(w, l);
@@ -1816,7 +1816,7 @@ int config_parse_unit_requires_mounts_for(
                 }
         }
 
-        return r;
+        return 0;
 }
 
 int config_parse_documentation(const char *unit,
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index e888480..4f47eb1 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1270,7 +1270,6 @@ int process_event(Server *s, struct epoll_event *ev) {
                 if ((ev->events|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
                         log_error("Got invalid event from epoll for %s: %"PRIx32,
                                   "stdout stream", ev->events);
-                        log_error("Got invalid event from epoll.");
                         return -EIO;
                 }