bus: rework sd_bus_error APIs

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

diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index f698b2ee9989b537b11bd34d4eac116253917b20..132426f6fdc1d4a47ab446857a904be5fbf80fe1 100644 (file)
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -624,18 +624,14 @@ _public_ int sd_bus_message_new_method_errorf(
 
         _cleanup_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         va_list ap;
-        int r;
 
         assert_return(name, -EINVAL);
         assert_return(m, -EINVAL);
 
         va_start(ap, format);
-        r = bus_error_setfv(&error, name, format, ap);
+        bus_error_setfv(&error, name, format, ap);
         va_end(ap);
 
-        if (r < 0)
-                return r;
-
         return sd_bus_message_new_method_error(call, &error, m);
 }
 
@@ -664,15 +660,11 @@ _public_ int sd_bus_message_new_method_errnof(
 
         _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
         va_list ap;
-        int r;
 
         va_start(ap, format);
-        r = bus_error_set_errnofv(&berror, error, format, ap);
+        bus_error_set_errnofv(&berror, error, format, ap);
         va_end(ap);
 
-        if (r < 0)
-                return r;
-
         return sd_bus_message_new_method_error(call, &berror, m);
 }
 
@@ -2133,7 +2125,7 @@ int bus_message_append_ap(
                         return r;
         }
 
-        return 0;
+        return 1;
 }
 
 _public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) {
@@ -4468,3 +4460,9 @@ _public_ int sd_bus_message_verify_type(sd_bus_message *m, char type, const char
 
         return 1;
 }
+
+_public_ sd_bus *sd_bus_message_get_bus(sd_bus_message *m) {
+        assert_return(m, NULL);
+
+        return m->bus;
+}