diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-27 07:58:57 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-27 07:59:15 +0200 |
| commit | 8a7935a23bfec14beb73e004beb01273254cf789 (patch) | |
| tree | 3dd607c91d7f882d31c0c9ac55ec196e0c56516c | |
| parent | 278d4bcfe981d058380cf388e5ac09d761438820 (diff) | |
| download | systemd-8a7935a23bfec14beb73e004beb01273254cf789.tar.gz | |
Do not use unitialized variable and remove duplicated line
| -rw-r--r-- | src/core/load-fragment.c | 4 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 70ea13aa80..44920d6449 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 e888480284..4f47eb1c11 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; } |