[systemd-commits] 2 commits - src/login src/systemctl

[Lennart Poettering]

 src/login/logind.c        |    3 +--
 src/systemctl/systemctl.c |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 31d5a60cae19025225eda458386e0692bec5eec4
Author: Maciej Wereski <m.wereski at partner.samsung.com>
Date:   Wed Feb 19 11:39:01 2014 +0100

    systemctl: remove erroneous return in runlevel_parse_argv()

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index ef0cbc5..e529095 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5879,7 +5879,6 @@ static int runlevel_parse_argv(int argc, char *argv[]) {
 
                 case ARG_HELP:
                         return runlevel_help();
-                        return 0;
 
                 case '?':
                         return -EINVAL;

commit d1368aa9bd2f5748152ed0663566c0baa854dfc5
Author: Maciej Wereski <m.wereski at partner.samsung.com>
Date:   Wed Feb 19 11:39:00 2014 +0100

    logind: remove redundant check in manager_new()

diff --git a/src/login/logind.c b/src/login/logind.c
index 2add241..7aea3cd 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -73,8 +73,7 @@ Manager *manager_new(void) {
         m->busnames = set_new(string_hash_func, string_compare_func);
 
         if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames ||
-            !m->user_units || !m->session_units ||
-            !m->busnames) {
+            !m->user_units || !m->session_units) {
                 manager_free(m);
                 return NULL;
         }