bus: add C++ wrappers to public header files

[elogind.git] / src / libsystemd-bus / bus-control.c

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 50e1a2c00a64aa7940f7f0e264c30674a478b579..06afaf3c7698f9e931da3be0de9c467611d531bc 100644 (file)
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -28,11 +28,20 @@
 #include "bus-internal.h"
 #include "bus-message.h"
 
-const char *sd_bus_get_unique_name(sd_bus *bus) {
+int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
+        int r;
+
         if (!bus)
-                return NULL;
+                return -EINVAL;
+        if (!unique)
+                return -EINVAL;
 
-        return bus->unique_name;
+        r = bus_ensure_running(bus);
+        if (r < 0)
+                return r;
+
+        *unique = bus->unique_name;
+        return 0;
 }
 
 int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
@@ -59,7 +68,7 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
         if (r < 0)
                 return r;
 
@@ -94,7 +103,7 @@ int sd_bus_release_name(sd_bus *bus, const char *name) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
         if (r < 0)
                 return r;
 
@@ -135,11 +144,11 @@ int sd_bus_list_names(sd_bus *bus, char ***l) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m1, (uint64_t) -1, NULL, &reply1);
+        r = sd_bus_send_with_reply_and_block(bus, m1, 0, NULL, &reply1);
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m2, (uint64_t) -1, NULL, &reply2);
+        r = sd_bus_send_with_reply_and_block(bus, m2, 0, NULL, &reply2);
         if (r < 0)
                 return r;
 
@@ -183,7 +192,7 @@ int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
         if (r < 0)
                 return r;
 
@@ -230,7 +239,7 @@ int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
         if (r < 0)
                 return r;
 
@@ -268,7 +277,7 @@ int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
         if (r < 0)
                 return r;
 
@@ -306,7 +315,7 @@ int sd_bus_add_match(sd_bus *bus, const char *match) {
         if (r < 0)
                 return r;
 
-        return sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        return sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
 }
 
 int sd_bus_remove_match(sd_bus *bus, const char *match) {
@@ -332,5 +341,5 @@ int sd_bus_remove_match(sd_bus *bus, const char *match) {
         if (r < 0)
                 return r;
 
-        return sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+        return sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
 }