Merge pull request #976 from elfring/Remove_unnecessary_checks2

Delete unnecessary checks before some function calls

2 files changed, 2 insertions, 8 deletions

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index b52285403f..a212f0b398 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -143,11 +143,7 @@ static void message_free(sd_bus_message *m) {
         if (m->iovec != m->iovec_fixed)
                 free(m->iovec);
 
-        if (m->destination_ptr) {
-                free(m->destination_ptr);
-                m->destination_ptr = NULL;
-        }
-
+        m->destination_ptr = mfree(m->destination_ptr);
         message_reset_containers(m);
         free(m->root_container.signature);
         free(m->root_container.offsets);
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index b97729caf7..a0aecc1f55 100644
--- 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;
 }