From 125dd07483b6836106ff9ad3ce1737d8a6c56c59 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Fri, 3 Oct 2014 19:47:47 -0400

Subject: [PATCH] sd-bus: split out cleanup into separate function

m is always non-null at this point. This function is too long anyway.

---

 src/libsystemd/sd-bus/bus-kernel.c | 25 ++++++++++++++-----------

 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c

index 0c39e22ed7..09ff25fe71 100644

--- a/src/libsystemd/sd-bus/bus-kernel.c

+++ b/src/libsystemd/sd-bus/bus-kernel.c

@@ -332,6 +332,18 @@ fail:

         return r;

 }

+static void unset_memfds(struct sd_bus_message *m) {

+        struct bus_body_part *part;

+        unsigned i;

+

+        assert(m);

+

+        /* Make sure the memfds are not freed twice */

+        MESSAGE_FOREACH_PART(part, i, m)

+                if (part->memfd >= 0)

+                        part->memfd = -1;

+}

+

 static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {

         sd_bus_message *m = NULL;

         struct kdbus_item *d;

@@ -627,17 +639,8 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {

         return 1;

 fail:

-        if (m) {

-                struct bus_body_part *part;

-                unsigned i;

-

-                /* Make sure the memfds are not freed twice */

-                MESSAGE_FOREACH_PART(part, i, m)

-                        if (part->memfd >= 0)

-                                part->memfd = -1;

-

-                sd_bus_message_unref(m);

-        }

+        unset_memfds(m);

+        sd_bus_message_unref(m);

         return r;

 }