From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 3 Mar 2014 15:16:08 +0000 (+0100)
Subject: Split out most of virDBusIsServiceEnabled
X-Git-Tag: v1.2.3-rc1~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65a4cb03c72d30ee8fd9494e18f112b394318d48;p=thirdparty%2Flibvirt.git

Split out most of virDBusIsServiceEnabled

Introduce virDBusIsServiceInList which can be used to call other
methods for listing services (ListNames), not just ListActivatableNames.

No functional change, fixed the 'Retruns' typo.
---

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index a6232b70ac..eace923813 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -1256,13 +1256,7 @@ int virDBusMessageRead(DBusMessage *msg,
     return ret;
 }
 
-/**
- * virDBusIsServiceEnabled:
- * @name: service name
- *
- * Retruns 0 if service is available, -1 on fatal error, or -2 if service is not available
- */
-int virDBusIsServiceEnabled(const char *name)
+static int virDBusIsServiceInList(const char *listMethod, const char *name)
 {
     DBusConnection *conn;
     DBusMessage *reply = NULL;
@@ -1280,7 +1274,7 @@ int virDBusIsServiceEnabled(const char *name)
                           "org.freedesktop.DBus",
                           "/org/freedesktop/DBus",
                           "org.freedesktop.DBus",
-                          "ListActivatableNames",
+                          listMethod,
                           NULL) < 0)
         return ret;
 
@@ -1305,13 +1299,25 @@ int virDBusIsServiceEnabled(const char *name)
         }
     }
 
-    VIR_DEBUG("Service %s is %s", name, ret ? "unavailable" : "available");
-
  cleanup:
     dbus_message_unref(reply);
     return ret;
 }
 
+/**
+ * virDBusIsServiceEnabled:
+ * @name: service name
+ *
+ * Returns 0 if service is available, -1 on fatal error, or -2 if service is not available
+ */
+int virDBusIsServiceEnabled(const char *name)
+{
+    int ret = virDBusIsServiceInList("ListActivatableNames", name);
+
+    VIR_DEBUG("Service %s is %s", name, ret ? "unavailable" : "available");
+
+    return ret;
+}
 
 #else /* ! WITH_DBUS */
 void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED)