From 47c649b5de480b832bb11e0d52ba58d962d61fb2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Nov 2013 22:17:19 +0100
Subject: bus: use new property retrieval calls everywhere

---
 src/journal/journal-gatewayd.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/journal/journal-gatewayd.c')

diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c
index 093dc74e2..c51afbfeb 100644
--- a/src/journal/journal-gatewayd.c
+++ b/src/journal/journal-gatewayd.c
@@ -742,9 +742,7 @@ static int request_handler_file(
 }
 
 static int get_virtualization(char **v) {
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_unref_ sd_bus *bus = NULL;
-        const char *t;
         char *b;
         int r;
 
@@ -752,33 +750,23 @@ static int get_virtualization(char **v) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_call_method(
+        r = sd_bus_get_property_string(
                         bus,
                         "org.freedesktop.systemd1",
                         "/org/freedesktop/systemd1",
-                        "org.freedesktop.DBus.Properties",
-                        "Get",
-                        NULL,
-                        &reply,
-                        "ss",
                         "org.freedesktop.systemd1.Manager",
-                        "Virtualization");
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_read(reply, "v", "s", &t);
+                        "Virtualization",
+                        NULL,
+                        &b);
         if (r < 0)
                 return r;
 
-        if (isempty(t)) {
+        if (isempty(b)) {
+                free(b);
                 *v = NULL;
                 return 0;
         }
 
-        b = strdup(t);
-        if (!b)
-                return -ENOMEM;
-
         *v = b;
         return 1;
 }
-- 
cgit v1.2.3