machined: minor code cleanups, such as voidifying calls

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 06dda19c43a026f3f89ec026536ed4429948750a..008bbbc3f401dd26e2d288dc03c21c3661f91c82 100644 (file)
--- 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 3577c809a4b20868c99eb962502f3873f69105e3..41b4cdad6dac68aa100c0d7833f82baaf69720cd 100644 (file)
--- 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;
 }