diff --git a/src/util/virdbus.c b/src/util/virdbus.c index a6232b70acab26c9d68d496e3d32555fc39498c4..eace9238138d600acabb2a6d3cfe9ba3d7f34214 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)