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

The following functions return immediately if a null pointer was passed.
* calendar_spec_free
* link_address_free
* manager_free
* sd_bus_unref
* sd_journal_close
* udev_monitor_unref
* udev_unref

It is therefore not needed that a function caller repeats a corresponding check.

This issue was fixed by using the software Coccinelle 1.0.1.

diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 74a9914358e8e2974437316dcb01d2021ba74ea3..8ea2cf84a493906b932f2461e3c03acc1da4633a 100644 (file)
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -252,8 +252,7 @@ static int bus_timer_set_transient_property(
 
                         v = new0(TimerValue, 1);
                         if (!v) {
-                                if (c)
-                                        calendar_spec_free(c);
+                                calendar_spec_free(c);
                                 return -ENOMEM;
                         }
 

diff --git a/src/core/timer.c b/src/core/timer.c
index 51cd56ca84c370e867335319b469cb83b972ef74..7027f83dfd600abbc8deae4c48e9782c5914296b 100644 (file)
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -56,10 +56,7 @@ void timer_free_values(Timer *t) {
 
         while ((v = t->values)) {
                 LIST_REMOVE(value, t->values, v);
-
-                if (v->calendar_spec)
-                        calendar_spec_free(v->calendar_spec);
-
+                calendar_spec_free(v->calendar_spec);
                 free(v);
         }
 }

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 1eb07a16810c2463de596abca0fa7091488b8660..ebdd9edfc3c393eba002c8cd84cbce12ba3b13ea 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -103,8 +103,7 @@ static void request_meta_free(
         if (!m)
                 return;
 
-        if (m->journal)
-                sd_journal_close(m->journal);
+        sd_journal_close(m->journal);
 
         if (m->tmp)
                 fclose(m->tmp);

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 28b1472ac80e497d1e143f5fbb3f17c349ce9379..fa2e9b9825e3b43b126617289916f8da058a6f6c 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1689,6 +1689,5 @@ void server_done(Server *s) {
         if (s->mmap)
                 mmap_cache_unref(s->mmap);
 
-        if (s->udev)
-                udev_unref(s->udev);
+        udev_unref(s->udev);
 }

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index b97729caf7190d765acb58959c633056bd6fd5c6..a0aecc1f550923aa9d6ef6f1000ff3f456f18eb5 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -118,9 +118,7 @@ static int server_init(sd_bus **_bus) {
         return 0;
 
 fail:
-        if (bus)
-                sd_bus_unref(bus);
-
+        sd_bus_unref(bus);
         return r;
 }
 

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;
 }

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 1eeeaf17a50420260df7869d1e265f0d5fb709c8..c8ad157326549f3004cc197f88552d6104ac1277 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -355,8 +355,7 @@ int main(int argc, char *argv[]) {
         log_debug("systemd-machined stopped as pid "PID_FMT, getpid());
 
 finish:
-        if (m)
-                manager_free(m);
+        manager_free(m);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 5be01d3cb8a7ae079d56e3ad59476e0099d579e0..645f2a824cc79f04c75d5871d60c53563e62e36e 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -176,8 +176,7 @@ static int manager_process_address(sd_netlink *rtnl, sd_netlink_message *mm, voi
                 break;
 
         case RTM_DELADDR:
-                if (a)
-                        link_address_free(a);
+                link_address_free(a);
                 break;
         }
 

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index ea9b0c9c8436054f2b1e7e2ab1da5814f3a3e854..61bcf02b2f27a734af77f9c39eb23cc61abc77d6 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -286,8 +286,6 @@ finish:
                 audit_close(c.audit_fd);
 #endif
 
-        if (c.bus)
-                sd_bus_unref(c.bus);
-
+        sd_bus_unref(c.bus);
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }