From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Aug 2016 17:00:12 +0000 (+0200)
Subject: bus-util: support mapping signed integers with bus_map_properties()
X-Git-Tag: v232.2~90
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=afc4586231642a2f611fc6e0bdc29318da8a165b;p=elogind.git

bus-util: support mapping signed integers with bus_map_properties()

Let's make sure we can read the exit code/status properties exposed by PID 1
properly. Let's reuse the existing code for unsigned fields, as we just use it
to copy words around, and don't calculate it.
---

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 5ea4e5608..2af4dde34 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1063,29 +1063,27 @@ static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_
                 break;
         }
 
+        case SD_BUS_TYPE_INT32:
         case SD_BUS_TYPE_UINT32: {
-                uint32_t u;
-                uint32_t *p = userdata;
+                uint32_t u, *p = userdata;
 
                 r = sd_bus_message_read_basic(m, type, &u);
                 if (r < 0)
                         break;
 
                 *p = u;
-
                 break;
         }
 
+        case SD_BUS_TYPE_INT64:
         case SD_BUS_TYPE_UINT64: {
-                uint64_t t;
-                uint64_t *p = userdata;
+                uint64_t t, *p = userdata;
 
                 r = sd_bus_message_read_basic(m, type, &t);
                 if (r < 0)
                         break;
 
                 *p = t;
-
                 break;
         }