From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Apr 2018 14:37:52 +0000 (+0900)
Subject: bus-util: introduce bus_open_system_watch_bind_with_description()
X-Git-Tag: v239~401^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ddf50ffcbd5ed4d406264c23c23df4e76bc253c;p=thirdparty%2Fsystemd.git

bus-util: introduce bus_open_system_watch_bind_with_description()

Similar to 56fbd7187a5af44a90c258fbeb1f17114f226bb3, this adds
bus_open_system_watch_bind_with_description() to set description
for busses.
---

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 10f047026e5..a14e87d1ba1 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1657,7 +1657,7 @@ int bus_track_add_name_many(sd_bus_track *t, char **l) {
         return r;
 }
 
-int bus_open_system_watch_bind(sd_bus **ret) {
+int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *description) {
         _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
         const char *e;
         int r;
@@ -1670,6 +1670,12 @@ int bus_open_system_watch_bind(sd_bus **ret) {
         if (r < 0)
                 return r;
 
+        if (description) {
+                r = sd_bus_set_description(bus, description);
+                if (r < 0)
+                        return r;
+        }
+
         e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS");
         if (!e)
                 e = DEFAULT_SYSTEM_BUS_ADDRESS;
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 668c7cc982c..d03d0f82d95 100644
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -159,4 +159,7 @@ int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface
 
 int bus_track_add_name_many(sd_bus_track *t, char **l);
 
-int bus_open_system_watch_bind(sd_bus **ret);
+int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *description);
+static inline int bus_open_system_watch_bind(sd_bus **ret) {
+        return bus_open_system_watch_bind_with_description(ret, NULL);
+}