Bug #944: Deletion of unnecessary checks before a few calls of systemd functions

[thirdparty/systemd.git] / src / login / logind.c

diff --git a/src/login/logind.c b/src/login/logind.c
index cf71c0ec5a4c8ccbad96493d0816a97b89d0abe7..8ac2aceb9b37b540d49a21db09aee093fb465428 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -153,17 +153,12 @@ static void manager_free(Manager *m) {
 
         safe_close(m->console_active_fd);
 
-        if (m->udev_seat_monitor)
-                udev_monitor_unref(m->udev_seat_monitor);
-        if (m->udev_device_monitor)
-                udev_monitor_unref(m->udev_device_monitor);
-        if (m->udev_vcsa_monitor)
-                udev_monitor_unref(m->udev_vcsa_monitor);
-        if (m->udev_button_monitor)
-                udev_monitor_unref(m->udev_button_monitor);
-
-        if (m->udev)
-                udev_unref(m->udev);
+        udev_monitor_unref(m->udev_seat_monitor);
+        udev_monitor_unref(m->udev_device_monitor);
+        udev_monitor_unref(m->udev_vcsa_monitor);
+        udev_monitor_unref(m->udev_button_monitor);
+
+        udev_unref(m->udev);
 
         if (m->unlink_nologin)
                 (void) unlink("/run/nologin");
@@ -1170,8 +1165,7 @@ finish:
                   "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
-        if (m)
-                manager_free(m);
+        manager_free(m);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }