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 55e686ab5fae37e11b44682b0d4f85dd1c13fc4a..7263593acaf36d80213a55139072f03e16f2ca77 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1675,7 +1675,7 @@ int bus_track_add_name_many(sd_bus_track *t, char **l) {
 }
 #endif // 0
 
-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;
@@ -1688,6 +1688,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 d22b7d8c13bf77eb0101cafd5994a0d5d88cf487..5a3421405dd9978fd634acf474b05f425a54aebb 100644 (file)
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -179,4 +179,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);
 #endif // 0
 
-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);
+}