bus-message: remove shadow warning with log_debug_bus_message()

[elogind.git] / src / libelogind / sd-bus / sd-bus.c

diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index e4044397695c0c07b22f05e1e35ee67fe7cceac4..05395830f7092c686aae121313f0e5876fb7ddcb 100644 (file)
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -49,19 +49,20 @@
 #include "bus-track.h"
 #include "bus-slot.h"
 
-#define log_debug_bus_message(m) do { \
-                  sd_bus_message *_m = (m); \
-                  log_debug("1Got message type=%s sender=%s destination=%s object=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " error=%s", \
-                  bus_message_type_to_string(_m->header->type), \
-                  strna(sd_bus_message_get_sender(_m)), \
-                  strna(sd_bus_message_get_destination(_m)), \
-                  strna(sd_bus_message_get_path(_m)), \
-                  strna(sd_bus_message_get_interface(_m)), \
-                  strna(sd_bus_message_get_member(_m)), \
-                  BUS_MESSAGE_COOKIE(_m), \
-                  _m->reply_cookie, \
-                  strna(_m->error.message)); \
-                  } while (false)
+#define log_debug_bus_message(m)                                         \
+        do {                                                             \
+                sd_bus_message *_mm = (m);                               \
+                log_debug("Got message type=%s sender=%s destination=%s object=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " error=%s", \
+                          bus_message_type_to_string(_mm->header->type), \
+                          strna(sd_bus_message_get_sender(_mm)),         \
+                          strna(sd_bus_message_get_destination(_mm)),    \
+                          strna(sd_bus_message_get_path(_mm)),           \
+                          strna(sd_bus_message_get_interface(_mm)),      \
+                          strna(sd_bus_message_get_member(_mm)),         \
+                          BUS_MESSAGE_COOKIE(_mm),                       \
+                          _mm->reply_cookie,                             \
+                          strna(_mm->error.message));                    \
+        } while (false)
 
 static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
 static int attach_io_events(sd_bus *b);
@@ -130,6 +131,7 @@ static void bus_free(sd_bus *b) {
         if (b->kdbus_buffer)
                 munmap(b->kdbus_buffer, KDBUS_POOL_SIZE);
 
+        free(b->label);
         free(b->rbuffer);
         free(b->unique_name);
         free(b->auth_buffer);