From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 24 Apr 2018 16:16:44 +0000 (+0200)
Subject: machined: minor code cleanups, such as voidifying calls
X-Git-Tag: v239~339^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f054361b653d7cd8bf8f01ce29b8ba11e5939e;p=thirdparty%2Fsystemd.git

machined: minor code cleanups, such as voidifying calls
---

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 06dda19c43a..008bbbc3f40 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -236,7 +236,6 @@ static void machine_unlink(Machine *m) {
         assert(m);
 
         if (m->unit) {
-
                 char *sl;
 
                 sl = strjoina("/run/systemd/machines/unit:", m->unit);
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 3577c809a4b..41b4cdad6da 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -67,7 +67,8 @@ static int manager_new(Manager **ret) {
 static Manager* manager_unref(Manager *m) {
         Machine *machine;
 
-        assert(m);
+        if (!m)
+                return NULL;
 
         while (m->operations)
                 operation_free(m->operations);
@@ -387,14 +388,18 @@ int main(int argc, char *argv[]) {
 
         log_debug("systemd-machined running as pid "PID_FMT, getpid_cached());
 
-        sd_notify(false,
-                  "READY=1\n"
-                  "STATUS=Processing requests...");
+        (void) sd_notify(false,
+                         "READY=1\n"
+                         "STATUS=Processing requests...");
 
         r = manager_run(m);
 
         log_debug("systemd-machined stopped as pid "PID_FMT, getpid_cached());
 
+        (void) sd_notify(false,
+                         "STOPPING=1\n"
+                         "STATUS=Shutting down...");
+
 finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }