[systemd-commits] 2 commits - src/machine

[Dave Reisner]

 src/machine/machine.c  |    2 +-
 src/machine/machined.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2c4c73b3ffa123cc5c69f5749c58706aafb3f257
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Tue Jul 2 13:50:00 2013 -0400

    machine: fix -Wmaybe-uninitialized warning
    
    The return value of machine_start_scope might be undefined if m->scope
    is non-NULL.

diff --git a/src/machine/machine.c b/src/machine/machine.c
index f33ad54..d75c338 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -221,7 +221,7 @@ static int machine_start_scope(Machine *m) {
         _cleanup_free_ char *description = NULL;
         DBusError error;
         char *job;
-        int r;
+        int r = 0;
 
         assert(m);
 

commit aba8b84e8d72224445b67646974b9dabc0972187
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Tue Jul 2 13:44:50 2013 -0400

    machined: check correct return value for NULL

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 3cf7f92..86f8de9 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -98,7 +98,7 @@ int manager_add_machine(Manager *m, const char *name, Machine **_machine) {
         }
 
         machine = machine_new(m, name);
-        if (!m)
+        if (!machine)
                 return -ENOMEM;
 
         if (_machine)