bus-util: coding style cleanups

- replace `type *func()` -> `type* func()`,
- rename arguments for storing results.

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 9040e83ada6fb82e40e49d98c9bf42169e4ad8cd..b134adcfd4a6abf4ff709dcdc31dc7f8a549da2a 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -5317,7 +5317,7 @@ static int add_signing_key_one(sd_bus *bus, const char *fn, FILE *key) {
                 return log_error_errno(r, "Failed to read key '%s': %m", fn);
 
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-        r = bus_call_method(bus, bus_mgr, "AddSigningKey", &error, /* reply= */ NULL, "sst", fn, pem, UINT64_C(0));
+        r = bus_call_method(bus, bus_mgr, "AddSigningKey", &error, /* ret_reply= */ NULL, "sst", fn, pem, UINT64_C(0));
         if (r < 0)
                 return log_error_errno(r, "Failed to add signing key '%s': %s", fn, bus_error_message(&error, r));
 
@@ -5424,7 +5424,7 @@ static int remove_signing_key_one(sd_bus *bus, const char *fn) {
         assert_se(fn);
 
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-        r = bus_call_method(bus, bus_mgr, "RemoveSigningKey", &error, /* reply= */ NULL, "st", fn, UINT64_C(0));
+        r = bus_call_method(bus, bus_mgr, "RemoveSigningKey", &error, /* ret_reply= */ NULL, "st", fn, UINT64_C(0));
         if (r < 0)
                 return log_error_errno(r, "Failed to remove signing key '%s': %s", fn, bus_error_message(&error, r));
 

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 2098405dd0b156c73109c4fa48f233fde59e4ad9..3975bc1754715fd24705543e9c0f9e467c38b76f 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -775,7 +775,7 @@ int machine_start_getty(Machine *m, const char *ptmx_name, sd_bus_error *error)
         container_bus = allocated_bus ?: m->manager->bus;
         getty = strjoina("container-getty@", p, ".service");
 
-        r = bus_call_method(container_bus, bus_systemd_mgr, "StartUnit", error, /* reply = */ NULL, "ss", getty, "replace");
+        r = bus_call_method(container_bus, bus_systemd_mgr, "StartUnit", error, /* ret_reply = */ NULL, "ss", getty, "replace");
         if (r < 0)
                 return log_debug_errno(r, "Failed to StartUnit '%s' in container '%s': %m", getty, m->name);
 

diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
index 099cfa77f7390df6f30153a4225709d9980cfd45..6d6d52bd4c413c19f6d7e2be97542e9094ff521e 100644 (file)
--- a/src/shared/bus-get-properties.c
+++ b/src/shared/bus-get-properties.c
@@ -19,7 +19,7 @@ int bus_property_get_bool(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         int b = *(bool*) userdata;
 
@@ -33,7 +33,7 @@ int bus_property_set_bool(
                 const char *property,
                 sd_bus_message *value,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         int b, r;
 
@@ -52,7 +52,7 @@ int bus_property_get_tristate(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         /* Defaults to false. */
 
@@ -68,7 +68,7 @@ int bus_property_get_id128(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         sd_id128_t *id = userdata;
 
@@ -86,7 +86,7 @@ int bus_property_get_size(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         uint64_t sz = *(size_t*) userdata;
 
@@ -102,7 +102,7 @@ int bus_property_get_long(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         int64_t l = *(long*) userdata;
 
@@ -116,7 +116,7 @@ int bus_property_get_ulong(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         uint64_t ul = *(unsigned long*) userdata;
 
@@ -131,7 +131,7 @@ int bus_property_get_rlimit(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         const char *is_soft;
         struct rlimit *rl;
@@ -179,7 +179,7 @@ int bus_property_get_string_set(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         Set **s = ASSERT_PTR(userdata);
 
@@ -197,7 +197,7 @@ int bus_property_get_pidfdid(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         PidRef *pidref = ASSERT_PTR(userdata);
 

diff --git a/src/shared/bus-get-properties.h b/src/shared/bus-get-properties.h
index 3f445f0acddef056d30a9957a5b1bc56a065f137..c6f0b73bd4fdc00d4d2d95f515898ca003999c2c 100644 (file)
--- a/src/shared/bus-get-properties.h
+++ b/src/shared/bus-get-properties.h
@@ -5,10 +5,10 @@
 
 #include "forward.h"
 
-int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_set_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *error);
-int bus_property_get_tristate(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_get_id128(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_set_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *reterr_error);
+int bus_property_get_tristate(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_get_id128(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 
 #define bus_property_get_usec ((sd_bus_property_get_t) NULL)
 #define bus_property_set_usec ((sd_bus_property_set_t) NULL)
@@ -24,15 +24,15 @@ assert_cc(sizeof(unsigned) == sizeof(uint32_t));
 #if __SIZEOF_SIZE_T__ == 8
 #define bus_property_get_size ((sd_bus_property_get_t) NULL)
 #else
-int bus_property_get_size(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_size(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 #endif
 
 #if __SIZEOF_LONG__ == 8
 #define bus_property_get_long ((sd_bus_property_get_t) NULL)
 #define bus_property_get_ulong ((sd_bus_property_get_t) NULL)
 #else
-int bus_property_get_long(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_get_ulong(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_long(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_get_ulong(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 #endif
 
 /* uid_t and friends on Linux 32 bit. This means we can just use the
@@ -50,11 +50,11 @@ assert_cc(sizeof(pid_t) == sizeof(uint32_t));
 assert_cc(sizeof(mode_t) == sizeof(uint32_t));
 #define bus_property_get_mode ((sd_bus_property_get_t) NULL)
 
-int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 
-int bus_property_get_string_set(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_string_set(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 
-int bus_property_get_pidfdid(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_pidfdid(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 
 #define BUS_DEFINE_PROPERTY_GET_GLOBAL(function, bus_type, val)         \
         int function(sd_bus *bus,                                       \
@@ -63,7 +63,7 @@ int bus_property_get_pidfdid(sd_bus *bus, const char *path, const char *interfac
                      const char *property,                              \
                      sd_bus_message *reply,                             \
                      void *userdata,                                    \
-                     sd_bus_error *error) {                             \
+                     sd_bus_error *reterr_error) {                      \
                                                                         \
                 assert(bus);                                            \
                 assert(reply);                                          \
@@ -78,7 +78,7 @@ int bus_property_get_pidfdid(sd_bus *bus, const char *path, const char *interfac
                      const char *property,                              \
                      sd_bus_message *reply,                             \
                      void *userdata,                                    \
-                     sd_bus_error *error) {                             \
+                     sd_bus_error *reterr_error) {                      \
                                                                         \
                 data_type *data = ASSERT_PTR(userdata);                 \
                                                                         \
@@ -105,6 +105,6 @@ int bus_property_get_pidfdid(sd_bus *bus, const char *path, const char *interfac
         SD_BUS_PROPERTY(name "Monotonic", "t", bus_property_get_usec, (offset) + offsetof(struct dual_timestamp, monotonic), (flags))
 
 /* For deprecated properties. */
-int bus_property_get_bool_false(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_get_bool_true(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_get_uint64_max(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_bool_false(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_get_bool_true(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_get_uint64_max(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);

diff --git a/src/shared/bus-locator.c b/src/shared/bus-locator.c
index a310f61bb98798d293206e72ea8750ae933cf9cd..df8106be4953a4163f6bc03b94f3939ce1461177 100644 (file)
--- a/src/shared/bus-locator.c
+++ b/src/shared/bus-locator.c
@@ -92,7 +92,7 @@ const BusLocator* const bus_hostname = &(BusLocator){
  * within a single struct. */
 int bus_call_method_async(
                 sd_bus *bus,
-                sd_bus_slot **slot,
+                sd_bus_slot **ret_slot,
                 const BusLocator *locator,
                 const char *member,
                 sd_bus_message_handler_t callback,
@@ -105,7 +105,7 @@ int bus_call_method_async(
         assert(locator);
 
         va_start(ap, types);
-        r = sd_bus_call_method_asyncv(bus, slot, locator->destination, locator->path, locator->interface, member, callback, userdata, types, ap);
+        r = sd_bus_call_method_asyncv(bus, ret_slot, locator->destination, locator->path, locator->interface, member, callback, userdata, types, ap);
         va_end(ap);
 
         return r;
@@ -115,8 +115,8 @@ int bus_call_method(
                 sd_bus *bus,
                 const BusLocator *locator,
                 const char *member,
-                sd_bus_error *error,
-                sd_bus_message **reply,
+                sd_bus_error *reterr_error,
+                sd_bus_message **ret_reply,
                 const char *types, ...) {
 
         va_list ap;
@@ -125,7 +125,7 @@ int bus_call_method(
         assert(locator);
 
         va_start(ap, types);
-        r = sd_bus_call_methodv(bus, locator->destination, locator->path, locator->interface, member, error, reply, types, ap);
+        r = sd_bus_call_methodv(bus, locator->destination, locator->path, locator->interface, member, reterr_error, ret_reply, types, ap);
         va_end(ap);
 
         return r;
@@ -135,56 +135,57 @@ int bus_get_property(
                 sd_bus *bus,
                 const BusLocator *locator,
                 const char *member,
-                sd_bus_error *error,
-                sd_bus_message **reply,
+                sd_bus_error *reterr_error,
+                sd_bus_message **ret_reply,
                 const char *type) {
 
         assert(locator);
 
-        return sd_bus_get_property(bus, locator->destination, locator->path, locator->interface, member, error, reply, type);
+        return sd_bus_get_property(bus, locator->destination, locator->path, locator->interface, member, reterr_error, ret_reply, type);
 }
 
 int bus_get_property_trivial(
                 sd_bus *bus,
                 const BusLocator *locator,
                 const char *member,
-                sd_bus_error *error,
-                char type, void *ptr) {
+                sd_bus_error *reterr_error,
+                char type,
+                void *ret) {
 
         assert(locator);
 
-        return sd_bus_get_property_trivial(bus, locator->destination, locator->path, locator->interface, member, error, type, ptr);
+        return sd_bus_get_property_trivial(bus, locator->destination, locator->path, locator->interface, member, reterr_error, type, ret);
 }
 
 int bus_get_property_string(
                 sd_bus *bus,
                 const BusLocator *locator,
                 const char *member,
-                sd_bus_error *error,
+                sd_bus_error *reterr_error,
                 char **ret) {
 
         assert(locator);
 
-        return sd_bus_get_property_string(bus, locator->destination, locator->path, locator->interface, member, error, ret);
+        return sd_bus_get_property_string(bus, locator->destination, locator->path, locator->interface, member, reterr_error, ret);
 }
 
 int bus_get_property_strv(
                 sd_bus *bus,
                 const BusLocator *locator,
                 const char *member,
-                sd_bus_error *error,
+                sd_bus_error *reterr_error,
                 char ***ret) {
 
         assert(locator);
 
-        return sd_bus_get_property_strv(bus, locator->destination, locator->path, locator->interface, member, error, ret);
+        return sd_bus_get_property_strv(bus, locator->destination, locator->path, locator->interface, member, reterr_error, ret);
 }
 
 int bus_set_property(
                 sd_bus *bus,
                 const BusLocator *locator,
                 const char *member,
-                sd_bus_error *error,
+                sd_bus_error *reterr_error,
                 const char *type, ...) {
 
         va_list ap;
@@ -193,7 +194,7 @@ int bus_set_property(
         assert(locator);
 
         va_start(ap, type);
-        r = sd_bus_set_propertyv(bus, locator->destination, locator->path, locator->interface, member, error, type, ap);
+        r = sd_bus_set_propertyv(bus, locator->destination, locator->path, locator->interface, member, reterr_error, type, ap);
         va_end(ap);
 
         return r;
@@ -201,7 +202,7 @@ int bus_set_property(
 
 int bus_match_signal(
                 sd_bus *bus,
-                sd_bus_slot **ret,
+                sd_bus_slot **ret_slot,
                 const BusLocator *locator,
                 const char *member,
                 sd_bus_message_handler_t callback,
@@ -209,12 +210,12 @@ int bus_match_signal(
 
         assert(locator);
 
-        return sd_bus_match_signal(bus, ret, locator->destination, locator->path, locator->interface, member, callback, userdata);
+        return sd_bus_match_signal(bus, ret_slot, locator->destination, locator->path, locator->interface, member, callback, userdata);
 }
 
 int bus_match_signal_async(
                 sd_bus *bus,
-                sd_bus_slot **ret,
+                sd_bus_slot **ret_slot,
                 const BusLocator *locator,
                 const char *member,
                 sd_bus_message_handler_t callback,
@@ -223,16 +224,16 @@ int bus_match_signal_async(
 
         assert(locator);
 
-        return sd_bus_match_signal_async(bus, ret, locator->destination, locator->path, locator->interface, member, callback, install_callback, userdata);
+        return sd_bus_match_signal_async(bus, ret_slot, locator->destination, locator->path, locator->interface, member, callback, install_callback, userdata);
 }
 
 int bus_message_new_method_call(
                 sd_bus *bus,
-                sd_bus_message **m,
+                sd_bus_message **ret,
                 const BusLocator *locator,
                 const char *member) {
 
         assert(locator);
 
-        return sd_bus_message_new_method_call(bus, m, locator->destination, locator->path, locator->interface, member);
+        return sd_bus_message_new_method_call(bus, ret, locator->destination, locator->path, locator->interface, member);
 }

diff --git a/src/shared/bus-locator.h b/src/shared/bus-locator.h
index 467bc2b344c9342b29328e2a2e076592e8b81df6..9b0ac397750f2b8cbf67a42eaefb57c93964b792 100644 (file)
--- a/src/shared/bus-locator.h
+++ b/src/shared/bus-locator.h
@@ -26,13 +26,13 @@ extern const BusLocator* const bus_timesync_mgr;
 
 /* Shorthand flavors of the sd-bus convenience helpers with destination,path,interface strings encapsulated
  * within a single struct. */
-int bus_call_method_async(sd_bus *bus, sd_bus_slot **slot, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, void *userdata, const char *types, ...);
-int bus_call_method(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *types, ...);
-int bus_get_property(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *type);
-int bus_get_property_trivial(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, char type, void *ptr);
-int bus_get_property_string(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, char **ret);
-int bus_get_property_strv(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, char ***ret);
-int bus_set_property(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, const char *type, ...);
-int bus_match_signal(sd_bus *bus, sd_bus_slot **ret, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, void *userdata);
-int bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, sd_bus_message_handler_t install_callback, void *userdata);
-int bus_message_new_method_call(sd_bus *bus, sd_bus_message **m, const BusLocator *locator, const char *member);
+int bus_call_method_async(sd_bus *bus, sd_bus_slot **ret_slot, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, void *userdata, const char *types, ...);
+int bus_call_method(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *reterr_error, sd_bus_message **ret_reply, const char *types, ...);
+int bus_get_property(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *reterr_error, sd_bus_message **ret_reply, const char *type);
+int bus_get_property_trivial(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *reterr_error, char type, void *ret);
+int bus_get_property_string(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *reterr_error, char **ret);
+int bus_get_property_strv(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *reterr_error, char ***ret);
+int bus_set_property(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *reterr_error, const char *type, ...);
+int bus_match_signal(sd_bus *bus, sd_bus_slot **ret_slot, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, void *userdata);
+int bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret_slot, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, sd_bus_message_handler_t install_callback, void *userdata);
+int bus_message_new_method_call(sd_bus *bus, sd_bus_message **ret, const BusLocator *locator, const char *member);

diff --git a/src/shared/bus-log-control-api.c b/src/shared/bus-log-control-api.c
index 6ff7a3c04fc0f1c9b55ef3a9696dc251df996957..35c1e106568fc7c368329cba4e23618faa1cb753 100644 (file)
--- a/src/shared/bus-log-control-api.c
+++ b/src/shared/bus-log-control-api.c
@@ -20,7 +20,7 @@ int bus_property_get_log_level(
                 const char *property,
                 sd_bus_message *reply,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         _cleanup_free_ char *t = NULL;
         int r;
@@ -42,7 +42,7 @@ int bus_property_set_log_level(
                 const char *property,
                 sd_bus_message *value,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         const char *t;
         int r;
@@ -56,7 +56,7 @@ int bus_property_set_log_level(
 
         r = log_level_from_string(t);
         if (r < 0)
-                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid log level '%s'", t);
+                return sd_bus_error_setf(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Invalid log level '%s'", t);
 
         log_info("Setting log level to %s.", t);
         log_set_max_level(r);
@@ -73,7 +73,7 @@ int bus_property_set_log_target(
                 const char *property,
                 sd_bus_message *value,
                 void *userdata,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         LogTarget target;
         const char *t;
@@ -88,7 +88,7 @@ int bus_property_set_log_target(
 
         target = log_target_from_string(t);
         if (target < 0)
-                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid log target '%s'", t);
+                return sd_bus_error_setf(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Invalid log target '%s'", t);
 
         log_info("Setting log target to %s.", log_target_to_string(target));
         log_set_target_and_open(target);

diff --git a/src/shared/bus-log-control-api.h b/src/shared/bus-log-control-api.h
index 76647da02669203db1dde3ad5cd51735fcb9df6a..33453216ea138345fbfd66a20d0437c42b95f188 100644 (file)
--- a/src/shared/bus-log-control-api.h
+++ b/src/shared/bus-log-control-api.h
@@ -7,10 +7,10 @@ extern const BusObjectImplementation log_control_object;
 
 int bus_log_control_api_register(sd_bus *bus);
 
-int bus_property_get_log_level(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_set_log_level(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *error);
+int bus_property_get_log_level(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_set_log_level(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *reterr_error);
 
-int bus_property_get_log_target(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
-int bus_property_set_log_target(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_log_target(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
+int bus_property_set_log_target(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);
 
-int bus_property_get_syslog_identifier(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+int bus_property_get_syslog_identifier(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error);

diff --git a/src/shared/bus-map-properties.c b/src/shared/bus-map-properties.c
index 1a7f88c5f66be85b9ff50d8f55d2b1ac1b66a59c..2faa5cf387efb54d427ec0741de94acc51a52e30 100644 (file)
--- a/src/shared/bus-map-properties.c
+++ b/src/shared/bus-map-properties.c
@@ -8,7 +8,7 @@
 #include "string-util.h"
 #include "strv.h"
 
-int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata) {
         sd_id128_t *p = userdata;
         int r;
 
@@ -21,7 +21,7 @@ int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_err
         return 0;
 }
 
-int bus_map_strv_sort(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+int bus_map_strv_sort(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata) {
         char ***p = ASSERT_PTR(userdata);
         int r;
 
@@ -35,7 +35,7 @@ int bus_map_strv_sort(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus
         return 0;
 }
 
-int bus_map_job_id(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+int bus_map_job_id(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata) {
         uint32_t *p = ASSERT_PTR(userdata);
 
         assert(m);
@@ -139,7 +139,7 @@ int bus_message_map_all_properties(
                 sd_bus_message *m,
                 const struct bus_properties_map *map,
                 unsigned flags,
-                sd_bus_error *error,
+                sd_bus_error *reterr_error,
                 void *userdata) {
 
         int r;
@@ -179,7 +179,7 @@ int bus_message_map_all_properties(
 
                         v = (uint8_t *)userdata + prop->offset;
                         if (map[i].set)
-                                r = prop->set(sd_bus_message_get_bus(m), member, m, error, v);
+                                r = prop->set(sd_bus_message_get_bus(m), member, m, reterr_error, v);
                         else
                                 r = map_basic(m, flags, v);
                         if (r < 0)
@@ -214,18 +214,18 @@ int bus_map_all_properties(
                 const char *path,
                 const struct bus_properties_map *map,
                 unsigned flags,
-                sd_bus_error *error,
-                sd_bus_message **reply,
+                sd_bus_error *reterr_error,
+                sd_bus_message **ret_reply,
                 void *userdata) {
 
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         int r;
 
         assert(bus);
         assert(destination);
         assert(path);
         assert(map);
-        assert(reply || (flags & BUS_MAP_STRDUP));
+        assert(ret_reply || (flags & BUS_MAP_STRDUP));
 
         r = sd_bus_call_method(
                         bus,
@@ -233,18 +233,18 @@ int bus_map_all_properties(
                         path,
                         "org.freedesktop.DBus.Properties",
                         "GetAll",
-                        error,
-                        &m,
+                        reterr_error,
+                        &reply,
                         "s", "");
         if (r < 0)
                 return r;
 
-        r = bus_message_map_all_properties(m, map, flags, error, userdata);
+        r = bus_message_map_all_properties(reply, map, flags, reterr_error, userdata);
         if (r < 0)
                 return r;
 
-        if (reply)
-                *reply = sd_bus_message_ref(m);
+        if (ret_reply)
+                *ret_reply = TAKE_PTR(reply);
 
         return r;
 }

diff --git a/src/shared/bus-map-properties.h b/src/shared/bus-map-properties.h
index 4c36f572f2c023da49fc44287bafc118e846b771..e019266ac228bddd740aa45339cb63bcec6c75d8 100644 (file)
--- a/src/shared/bus-map-properties.h
+++ b/src/shared/bus-map-properties.h
@@ -3,7 +3,7 @@
 
 #include "forward.h"
 
-typedef int (*bus_property_set_t) (sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
+typedef int (*bus_property_set_t)(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata);
 
 struct bus_properties_map {
         const char *member;
@@ -17,10 +17,10 @@ enum {
         BUS_MAP_BOOLEAN_AS_BOOL = 1 << 1, /* If set, each "b" message is written to a bool pointer. If not set, "b" is written to an int pointer. */
 };
 
-int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
-int bus_map_strv_sort(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
-int bus_map_job_id(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
+int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata);
+int bus_map_strv_sort(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata);
+int bus_map_job_id(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata);
 
-int bus_message_map_all_properties(sd_bus_message *m, const struct bus_properties_map *map, unsigned flags, sd_bus_error *error, void *userdata);
+int bus_message_map_all_properties(sd_bus_message *m, const struct bus_properties_map *map, unsigned flags, sd_bus_error *reterr_error, void *userdata);
 int bus_map_all_properties(sd_bus *bus, const char *destination, const char *path, const struct bus_properties_map *map,
-                           unsigned flags, sd_bus_error *error, sd_bus_message **reply, void *userdata);
+                           unsigned flags, sd_bus_error *reterr_error, sd_bus_message **ret_reply, void *userdata);

diff --git a/src/shared/bus-message-util.c b/src/shared/bus-message-util.c
index dd939a67525a8ca33b502720fb1f73994aa32d3c..e4bf2174f5a6e92a2c5cbfd2fab3c5c09059a728 100644 (file)
--- a/src/shared/bus-message-util.c
+++ b/src/shared/bus-message-util.c
@@ -42,7 +42,7 @@ int bus_message_read_id128(sd_bus_message *m, sd_id128_t *ret) {
         }
 }
 
-int bus_message_read_ifindex(sd_bus_message *message, sd_bus_error *error, int *ret) {
+int bus_message_read_ifindex(sd_bus_message *message, sd_bus_error *reterr_error, int *ret) {
         int ifindex, r;
 
         assert(message);
@@ -55,14 +55,14 @@ int bus_message_read_ifindex(sd_bus_message *message, sd_bus_error *error, int *
                 return r;
 
         if (ifindex <= 0)
-                return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index");
+                return sd_bus_error_set(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index");
 
         *ret = ifindex;
 
         return 0;
 }
 
-int bus_message_read_family(sd_bus_message *message, sd_bus_error *error, int *ret) {
+int bus_message_read_family(sd_bus_message *message, sd_bus_error *reterr_error, int *ret) {
         int family, r;
 
         assert(message);
@@ -75,20 +75,20 @@ int bus_message_read_family(sd_bus_message *message, sd_bus_error *error, int *r
                 return r;
 
         if (!IN_SET(family, AF_INET, AF_INET6))
-                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family);
+                return sd_bus_error_setf(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family);
 
         *ret = family;
         return 0;
 }
 
-int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error, int *ret_family, union in_addr_union *ret_addr) {
+int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *reterr_error, int *ret_family, union in_addr_union *ret_addr) {
         int family, r;
         const void *d;
         size_t sz;
 
         assert(message);
 
-        r = bus_message_read_family(message, error, &family);
+        r = bus_message_read_family(message, reterr_error, &family);
         if (r < 0)
                 return r;
 
@@ -97,7 +97,7 @@ int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error,
                 return r;
 
         if (sz != FAMILY_ADDRESS_SIZE(family))
-                return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size");
+                return sd_bus_error_set(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size");
 
         if (ret_family)
                 *ret_family = family;
@@ -108,7 +108,7 @@ int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error,
 
 static int bus_message_read_dns_one(
                         sd_bus_message *message,
-                        sd_bus_error *error,
+                        sd_bus_error *reterr_error,
                         bool extended,
                         int *ret_family,
                         union in_addr_union *ret_address,
@@ -129,12 +129,12 @@ static int bus_message_read_dns_one(
         if (r <= 0)
                 return r;
 
-        r = bus_message_read_in_addr_auto(message, error, &family, &a);
+        r = bus_message_read_in_addr_auto(message, reterr_error, &family, &a);
         if (r < 0)
                 return r;
 
         if (!dns_server_address_valid(family, &a)) {
-                r = sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNS server address");
+                r = sd_bus_error_set(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNS server address");
                 assert(r < 0);
                 return r;
         }
@@ -166,7 +166,7 @@ static int bus_message_read_dns_one(
 
 int bus_message_read_dns_servers(
                         sd_bus_message *message,
-                        sd_bus_error *error,
+                        sd_bus_error *reterr_error,
                         bool extended,
                         struct in_addr_full ***ret_dns,
                         size_t *ret_n_dns) {
@@ -189,7 +189,7 @@ int bus_message_read_dns_servers(
                 uint16_t port;
                 int family;
 
-                r = bus_message_read_dns_one(message, error, extended, &family, &a, &port, &server_name);
+                r = bus_message_read_dns_one(message, reterr_error, extended, &family, &a, &port, &server_name);
                 if (r < 0)
                         goto clear;
                 if (r == 0)

diff --git a/src/shared/bus-message-util.h b/src/shared/bus-message-util.h
index 3580c843c45038c6ab5f1c7e34a8de706d83b38b..4e8fb4d4e50e9fbcb94d38f046a7dcdb663a5a74 100644 (file)
--- a/src/shared/bus-message-util.h
+++ b/src/shared/bus-message-util.h
@@ -5,13 +5,13 @@
 
 int bus_message_read_id128(sd_bus_message *m, sd_id128_t *ret);
 
-int bus_message_read_ifindex(sd_bus_message *message, sd_bus_error *error, int *ret);
-int bus_message_read_family(sd_bus_message *message, sd_bus_error *error, int *ret);
-int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error, int *ret_family, union in_addr_union *ret_addr);
+int bus_message_read_ifindex(sd_bus_message *message, sd_bus_error *reterr_error, int *ret);
+int bus_message_read_family(sd_bus_message *message, sd_bus_error *reterr_error, int *ret);
+int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *reterr_error, int *ret_family, union in_addr_union *ret_addr);
 
 int bus_message_read_dns_servers(
                         sd_bus_message *message,
-                        sd_bus_error *error,
+                        sd_bus_error *reterr_error,
                         bool extended,
                         struct in_addr_full ***ret_dns,
                         size_t *ret_n_dns);

diff --git a/src/shared/bus-object.c b/src/shared/bus-object.c
index d05619a3d4d49200e0e4a7344380a16ab43f2de0..12e0d191f65b2f4ba37facd5a73bb374698545e6 100644 (file)
--- a/src/shared/bus-object.c
+++ b/src/shared/bus-object.c
@@ -117,7 +117,7 @@ static void list_paths(
 int bus_introspect_implementations(
                 FILE *out,
                 const char *pattern,
-                const BusObjectImplementation* const* bus_objects) {
+                const BusObjectImplementation* const *bus_objects) {
 
         const BusObjectImplementation *impl, *main_impl = NULL;
         _cleanup_free_ char *s = NULL;

diff --git a/src/shared/bus-object.h b/src/shared/bus-object.h
index 2cdade79135d71f8d97d222d855cc6ebbb6680a0..85d8a4d9d9d0c28459792532680847694af8c837 100644 (file)
--- a/src/shared/bus-object.h
+++ b/src/shared/bus-object.h
@@ -26,4 +26,4 @@ int bus_add_implementation(sd_bus *bus, const BusObjectImplementation *impl, voi
 int bus_introspect_implementations(
                 FILE *out,
                 const char *pattern,
-                const BusObjectImplementation* const* bus_objects);
+                const BusObjectImplementation* const *bus_objects);

diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c
index b3ee9f58477b3e61ad2c6d49486a409c2c6d5188..176b2899db001363e4697240d291c7e96041a14c 100644 (file)
--- a/src/shared/bus-polkit.c
+++ b/src/shared/bus-polkit.c
@@ -109,8 +109,8 @@ int bus_test_polkit(
                 const char *action,
                 const char **details,
                 uid_t good_user,
-                bool *_challenge,
-                sd_bus_error *ret_error) {
+                bool *ret_challenge,
+                sd_bus_error *reterr_error) {
 
         int r;
 
@@ -126,8 +126,11 @@ int bus_test_polkit(
         r = sd_bus_query_sender_privilege(call, -1);
         if (r < 0)
                 return r;
-        if (r > 0)
+        if (r > 0) {
+                if (ret_challenge)
+                        *ret_challenge = false;
                 return 1;
+        }
 
 #if ENABLE_POLKIT
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL, *reply = NULL;
@@ -137,11 +140,11 @@ int bus_test_polkit(
         if (r < 0)
                 return r;
 
-        r = sd_bus_call(call->bus, request, 0, ret_error, &reply);
+        r = sd_bus_call(call->bus, request, 0, reterr_error, &reply);
         if (r < 0) {
                 /* Treat no PK available as access denied */
-                if (bus_error_is_unknown_service(ret_error)) {
-                        sd_bus_error_free(ret_error);
+                if (bus_error_is_unknown_service(reterr_error)) {
+                        sd_bus_error_free(reterr_error);
                         return -EACCES;
                 }
 
@@ -159,8 +162,8 @@ int bus_test_polkit(
         if (authorized)
                 return 1;
 
-        if (_challenge) {
-                *_challenge = challenge;
+        if (ret_challenge) {
+                *ret_challenge = challenge;
                 return 0;
         }
 #endif
@@ -177,7 +180,7 @@ typedef struct AsyncPolkitQueryAction {
         LIST_FIELDS(struct AsyncPolkitQueryAction, authorized);
 } AsyncPolkitQueryAction;
 
-static AsyncPolkitQueryAction *async_polkit_query_action_free(AsyncPolkitQueryAction *a) {
+static AsyncPolkitQueryAction* async_polkit_query_action_free(AsyncPolkitQueryAction *a) {
         if (!a)
                 return NULL;
 
@@ -209,7 +212,7 @@ typedef struct AsyncPolkitQuery {
         sd_bus_error error;                                     /* the precise error, in case error_action is set */
 } AsyncPolkitQuery;
 
-static AsyncPolkitQuery *async_polkit_query_free(AsyncPolkitQuery *q) {
+static AsyncPolkitQuery* async_polkit_query_free(AsyncPolkitQuery *q) {
         if (!q)
                 return NULL;
 
@@ -390,7 +393,7 @@ static int async_polkit_process_reply(sd_bus_message *reply, AsyncPolkitQuery *q
         return 1;
 }
 
-static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
+static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error) {
         AsyncPolkitQuery *q = ASSERT_PTR(userdata);
         int r;
 
@@ -428,7 +431,7 @@ static int async_polkit_query_check_action(
                 const char *action,
                 const char **details,
                 PolkitFlags flags,
-                sd_bus_error *ret_error) {
+                sd_bus_error *reterr_error) {
 
         assert(q);
         assert(action);
@@ -437,7 +440,7 @@ static int async_polkit_query_check_action(
                 return 1; /* Allow! */
 
         if (q->error_action && streq(q->error_action->action, action))
-                return sd_bus_error_copy(ret_error, &q->error);
+                return sd_bus_error_copy(reterr_error, &q->error);
 
         if (q->denied_action && streq(q->denied_action->action, action))
                 return -EACCES; /* Deny! */
@@ -541,7 +544,7 @@ int bus_verify_polkit_async_full(
                 uid_t good_user,
                 PolkitFlags flags,
                 Hashmap **registry,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         int r;
 
@@ -562,7 +565,7 @@ int bus_verify_polkit_async_full(
         /* This is a repeated invocation of this function, hence let's check if we've already got
          * a response from polkit for this action */
         if (q) {
-                r = async_polkit_query_check_action(q, action, details, flags, error);
+                r = async_polkit_query_check_action(q, action, details, flags, reterr_error);
                 if (r != 0) {
                         log_debug("Found matching previous polkit authentication for '%s'.", action);
                         return r;

diff --git a/src/shared/bus-polkit.h b/src/shared/bus-polkit.h
index 893ce635ead81ed2635893a91b222b725b3fa549..86e499e03d8e6add5675495edabb732c4acf9926 100644 (file)
--- a/src/shared/bus-polkit.h
+++ b/src/shared/bus-polkit.h
@@ -14,11 +14,11 @@ typedef enum PolkitFlags {
         _POLKIT_MASK_PUBLIC      = POLKIT_ALLOW_INTERACTIVE | POLKIT_ALWAYS_QUERY, /* polkit accepts these flags verbatim */
 } PolkitFlags;
 
-int bus_test_polkit(sd_bus_message *call, const char *action, const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e);
+int bus_test_polkit(sd_bus_message *call, const char *action, const char **details, uid_t good_user, bool *ret_challenge, sd_bus_error *reterr_error);
 
-int bus_verify_polkit_async_full(sd_bus_message *call, const char *action, const char **details, uid_t good_user, PolkitFlags flags, Hashmap **registry, sd_bus_error *error);
-static inline int bus_verify_polkit_async(sd_bus_message *call, const char *action, const char **details, Hashmap **registry, sd_bus_error *error) {
-        return bus_verify_polkit_async_full(call, action, details, UID_INVALID, 0, registry, error);
+int bus_verify_polkit_async_full(sd_bus_message *call, const char *action, const char **details, uid_t good_user, PolkitFlags flags, Hashmap **registry, sd_bus_error *reterr_error);
+static inline int bus_verify_polkit_async(sd_bus_message *call, const char *action, const char **details, Hashmap **registry, sd_bus_error *reterr_error) {
+        return bus_verify_polkit_async_full(call, action, details, UID_INVALID, 0, registry, reterr_error);
 }
 
 int varlink_verify_polkit_async_full(sd_varlink *link, sd_bus *bus, const char *action, const char **details, uid_t good_user, PolkitFlags flags, Hashmap **registry);

diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c
index fb3aa8d2dbf8551d3808f100f53ee0624153d185..f5ea74f58243d4b41df51bc35e55adadd8136146 100644 (file)
--- a/src/shared/bus-print-properties.c
+++ b/src/shared/bus-print-properties.c
@@ -427,7 +427,7 @@ int bus_print_all_properties(
                 bus_message_print_t func,
                 char **filter,
                 BusPrintPropertyFlags flags,
-                sd_bus_error *reterr) {
+                sd_bus_error *reterr_error) {
 
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         int r;
@@ -440,7 +440,7 @@ int bus_print_all_properties(
                         path,
                         "org.freedesktop.DBus.Properties",
                         "GetAll",
-                        reterr,
+                        reterr_error,
                         &reply,
                         "s", "");
         if (r < 0)

diff --git a/src/shared/bus-print-properties.h b/src/shared/bus-print-properties.h
index 0ae450c1ded67642af8ecfbef4077f8dd5667e87..16433de9bc837808fa40a75515c6983dbd327b4a 100644 (file)
--- a/src/shared/bus-print-properties.h
+++ b/src/shared/bus-print-properties.h
@@ -13,4 +13,4 @@ typedef int (*bus_message_print_t) (const char *name, const char *expected_value
 int bus_print_property_value(const char *name, const char *expected_value, BusPrintPropertyFlags flags, const char *value);
 int bus_print_property_valuef(const char *name, const char *expected_value, BusPrintPropertyFlags flags, const char *fmt, ...) _printf_(4,5);
 int bus_message_print_all_properties(sd_bus_message *m, bus_message_print_t func, char **filter, BusPrintPropertyFlags flags, Set **found_properties);
-int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, bus_message_print_t func, char **filter, BusPrintPropertyFlags flags, sd_bus_error *reterr);
+int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, bus_message_print_t func, char **filter, BusPrintPropertyFlags flags, sd_bus_error *reterr_error);

diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
index cfdfb736f7e2f9b3abfe522609f047fca56ef3b7..9aea7db7853282b7b6b19da56f49dfbdd5ed12d1 100644 (file)
--- a/src/shared/bus-unit-procs.c
+++ b/src/shared/bus-unit-procs.c
@@ -332,7 +332,7 @@ int unit_show_processes(
                 const char *prefix,
                 unsigned n_columns,
                 OutputFlags flags,
-                sd_bus_error *error) {
+                sd_bus_error *reterr_error) {
 
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         Hashmap *cgroups = NULL;
@@ -353,7 +353,7 @@ int unit_show_processes(
                         bus,
                         bus_systemd_mgr,
                         "GetUnitProcesses",
-                        error,
+                        reterr_error,
                         &reply,
                         "s",
                         unit);

diff --git a/src/shared/bus-unit-procs.h b/src/shared/bus-unit-procs.h
index e112ef5dabad889705a527721422df8dfdd30616..f2665ad79b19088a0c4bbd19aed4e30765805227 100644 (file)
--- a/src/shared/bus-unit-procs.h
+++ b/src/shared/bus-unit-procs.h
@@ -3,4 +3,4 @@
 
 #include "forward.h"
 
-int unit_show_processes(sd_bus *bus, const char *unit, const char *cgroup_path, const char *prefix, unsigned n_columns, OutputFlags flags, sd_bus_error *error);
+int unit_show_processes(sd_bus *bus, const char *unit, const char *cgroup_path, const char *prefix, unsigned n_columns, OutputFlags flags, sd_bus_error *reterr_error);

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index ce56defeacc1fcf91253b904e5462241fd295540..4befd0a06c5595f81132c1822e6ffb7d9b95373e 100644 (file)
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -2944,7 +2944,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, UnitType t, const cha
                                "Unknown assignment: %s", assignment);
 }
 
-int bus_append_unit_property_assignment_many(sd_bus_message *m, UnitType t, char **l) {
+int bus_append_unit_property_assignment_many(sd_bus_message *m, UnitType t, char * const *l) {
         int r;
 
         assert(m);
@@ -3014,7 +3014,7 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet) {
         return 0;
 }
 
-int unit_load_state(sd_bus *bus, const char *name, char **load_state) {
+int unit_load_state(sd_bus *bus, const char *name, char **ret) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_free_ char *path = NULL;
         int r;
@@ -3033,7 +3033,7 @@ int unit_load_state(sd_bus *bus, const char *name, char **load_state) {
                         "org.freedesktop.systemd1.Unit",
                         "LoadState",
                         &error,
-                        load_state);
+                        ret);
         if (r < 0)
                 return log_error_errno(r, "Failed to get load state of %s: %s", name, bus_error_message(&error, r));
 
@@ -3132,7 +3132,7 @@ static int unit_freezer_action(UnitFreezer *f, bool freeze) {
         r = bus_call_method(f->bus, bus_systemd_mgr,
                             freeze ? "FreezeUnit" : "ThawUnit",
                             &error,
-                            /* reply = */ NULL,
+                            /* ret_reply = */ NULL,
                             "s",
                             f->name);
         if (r < 0) {

diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h
index ba3115c080689170469004dd7d17ac12ef0304ca..c6e02a01b4007c6184ff09e691523ff21ea722d5 100644 (file)
--- a/src/shared/bus-unit-util.h
+++ b/src/shared/bus-unit-util.h
@@ -30,13 +30,13 @@ typedef struct UnitInfo {
 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u);
 
 int bus_append_unit_property_assignment(sd_bus_message *m, UnitType t, const char *assignment);
-int bus_append_unit_property_assignment_many(sd_bus_message *m, UnitType t, char **l);
+int bus_append_unit_property_assignment_many(sd_bus_message *m, UnitType t, char * const *l);
 
 int bus_append_scope_pidref(sd_bus_message *m, const PidRef *pidref, bool allow_pidfd);
 
 int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet);
 
-int unit_load_state(sd_bus *bus, const char *name, char **load_state);
+int unit_load_state(sd_bus *bus, const char *name, char **ret);
 
 int unit_info_compare(const UnitInfo *a, const UnitInfo *b);
 

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 68e6c9984ae6619d11de5b897a7adbfbfefc1e02..efde906636c7eaccd9b2168ee3f4659412481b30 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -37,7 +37,7 @@
 #include "time-util.h"
 #include "uid-classification.h"
 
-static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *reterr_error) {
         sd_event *e = ASSERT_PTR(userdata);
 
         assert(m);
@@ -179,19 +179,19 @@ int bus_event_loop_with_idle(
         return code;
 }
 
-int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error) {
+int bus_name_has_owner(sd_bus *bus, const char *name, sd_bus_error *reterr_error) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *rep = NULL;
         int r, has_owner = 0;
 
-        assert(c);
+        assert(bus);
         assert(name);
 
-        r = sd_bus_call_method(c,
+        r = sd_bus_call_method(bus,
                                "org.freedesktop.DBus",
                                "/org/freedesktop/dbus",
                                "org.freedesktop.DBus",
                                "NameHasOwner",
-                               error,
+                               reterr_error,
                                &rep,
                                "s",
                                name);
@@ -200,7 +200,7 @@ int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error) {
 
         r = sd_bus_message_read_basic(rep, 'b', &has_owner);
         if (r < 0)
-                return sd_bus_error_set_errno(error, r);
+                return sd_bus_error_set_errno(reterr_error, r);
 
         return has_owner;
 }
@@ -219,13 +219,13 @@ bool bus_error_is_connection(const sd_bus_error *error) {
                                       SD_BUS_ERROR_TIMED_OUT);
 }
 
-int bus_check_peercred(sd_bus *c) {
+int bus_check_peercred(sd_bus *bus) {
         struct ucred ucred;
         int fd, r;
 
-        assert(c);
+        assert(bus);
 
-        fd = sd_bus_get_fd(c);
+        fd = sd_bus_get_fd(bus);
         if (fd < 0)
                 return fd;
 
@@ -239,11 +239,11 @@ int bus_check_peercred(sd_bus *c) {
         return 1;
 }
 
-int bus_connect_system_systemd(sd_bus **ret_bus) {
+int bus_connect_system_systemd(sd_bus **ret) {
         _cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        assert(ret_bus);
+        assert(ret);
 
         r = sd_bus_new(&bus);
         if (r < 0)
@@ -261,17 +261,17 @@ int bus_connect_system_systemd(sd_bus **ret_bus) {
         if (r < 0)
                 return r;
 
-        *ret_bus = TAKE_PTR(bus);
+        *ret = TAKE_PTR(bus);
         return 0;
 }
 
-int bus_connect_user_systemd(sd_bus **ret_bus) {
+int bus_connect_user_systemd(sd_bus **ret) {
         _cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
         _cleanup_free_ char *ee = NULL;
         const char *e;
         int r;
 
-        assert(ret_bus);
+        assert(ret);
 
         e = secure_getenv("XDG_RUNTIME_DIR");
         if (!e)
@@ -297,7 +297,7 @@ int bus_connect_user_systemd(sd_bus **ret_bus) {
         if (r < 0)
                 return r;
 
-        *ret_bus = TAKE_PTR(bus);
+        *ret = TAKE_PTR(bus);
         return 0;
 }
 
@@ -374,13 +374,13 @@ int bus_set_address_capsule_bus(sd_bus *bus, const char *capsule, int *ret_pin_f
         return bus_set_address_capsule(bus, capsule, "bus", ret_pin_fd);
 }
 
-int bus_connect_capsule_systemd(const char *capsule, sd_bus **ret_bus) {
+int bus_connect_capsule_systemd(const char *capsule, sd_bus **ret) {
         _cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
         _cleanup_close_ int inode_fd = -EBADF;
         int r;
 
         assert(capsule);
-        assert(ret_bus);
+        assert(ret);
 
         r = sd_bus_new(&bus);
         if (r < 0)
@@ -394,17 +394,17 @@ int bus_connect_capsule_systemd(const char *capsule, sd_bus **ret_bus) {
         if (r < 0)
                 return r;
 
-        *ret_bus = TAKE_PTR(bus);
+        *ret = TAKE_PTR(bus);
         return 0;
 }
 
-int bus_connect_capsule_bus(const char *capsule, sd_bus **ret_bus) {
+int bus_connect_capsule_bus(const char *capsule, sd_bus **ret) {
         _cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
         _cleanup_close_ int inode_fd = -EBADF;
         int r;
 
         assert(capsule);
-        assert(ret_bus);
+        assert(ret);
 
         r = sd_bus_new(&bus);
         if (r < 0)
@@ -422,7 +422,7 @@ int bus_connect_capsule_bus(const char *capsule, sd_bus **ret_bus) {
         if (r < 0)
                 return r;
 
-        *ret_bus = TAKE_PTR(bus);
+        *ret = TAKE_PTR(bus);
         return 0;
 }
 
@@ -511,13 +511,13 @@ int bus_connect_transport_systemd(
                 BusTransport transport,
                 const char *host,
                 RuntimeScope runtime_scope,
-                sd_bus **ret_bus) {
+                sd_bus **ret) {
 
         int r;
 
         assert(transport >= 0);
         assert(transport < _BUS_TRANSPORT_MAX);
-        assert(ret_bus);
+        assert(ret);
 
         switch (transport) {
 
@@ -527,14 +527,14 @@ int bus_connect_transport_systemd(
                 switch (runtime_scope) {
 
                 case RUNTIME_SCOPE_USER:
-                        r = bus_connect_user_systemd(ret_bus);
+                        r = bus_connect_user_systemd(ret);
                         /* We used to always fall back to the user session bus if we couldn't connect to the
                          * private manager bus. To keep compat with existing code that was setting
                          * DBUS_SESSION_BUS_ADDRESS without setting XDG_RUNTIME_DIR, connect to the user
                          * session bus if DBUS_SESSION_BUS_ADDRESS is set and XDG_RUNTIME_DIR isn't. */
                         if (r == -ENOMEDIUM && secure_getenv("DBUS_SESSION_BUS_ADDRESS")) {
                                 log_debug_errno(r, "$XDG_RUNTIME_DIR not set, unable to connect to private bus. Falling back to session bus.");
-                                r = sd_bus_default_user(ret_bus);
+                                r = sd_bus_default_user(ret);
                         }
 
                         return r;
@@ -548,9 +548,9 @@ int bus_connect_transport_systemd(
                         /* If we are root then let's talk directly to the system instance, instead of
                          * going via the bus. */
                         if (geteuid() == 0)
-                                return bus_connect_system_systemd(ret_bus);
+                                return bus_connect_system_systemd(ret);
 
-                        return sd_bus_default_system(ret_bus);
+                        return sd_bus_default_system(ret);
 
                 default:
                         assert_not_reached();
@@ -560,15 +560,15 @@ int bus_connect_transport_systemd(
 
         case BUS_TRANSPORT_REMOTE:
                 assert_return(runtime_scope == RUNTIME_SCOPE_SYSTEM, -EOPNOTSUPP);
-                return sd_bus_open_system_remote(ret_bus, host);
+                return sd_bus_open_system_remote(ret, host);
 
         case BUS_TRANSPORT_MACHINE:
                 assert_return(runtime_scope == RUNTIME_SCOPE_SYSTEM, -EOPNOTSUPP);
-                return sd_bus_open_system_machine(ret_bus, host);
+                return sd_bus_open_system_machine(ret, host);
 
         case BUS_TRANSPORT_CAPSULE:
                 assert_return(runtime_scope == RUNTIME_SCOPE_USER, -EINVAL);
-                return bus_connect_capsule_systemd(host, ret_bus);
+                return bus_connect_capsule_systemd(host, ret);
 
         default:
                 assert_not_reached();
@@ -788,7 +788,7 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
         return 0;
 }
 
-int bus_reply_pair_array(sd_bus_message *m, char **l) {
+int bus_reply_pair_array(sd_bus_message *m, char * const *l) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         int r;
 
@@ -818,7 +818,7 @@ int bus_reply_pair_array(sd_bus_message *m, char **l) {
         return sd_bus_send(NULL, reply, NULL);
 }
 
-static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
+static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
         _cleanup_(memstream_done) MemStream m = {};
         _cleanup_free_ char *dump = NULL;
         _cleanup_close_ int fd = -EBADF;
@@ -853,7 +853,7 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat
 
 /* The default install callback will fail and disconnect the bus if it cannot register the match, but this
  * is only a debug method, we definitely don't want to fail in case there's some permission issue. */
-static int dummy_install_callback(sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
+static int dummy_install_callback(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
         return 1;
 }
 

diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index ffd8bd6e347c0bb78ca9bebf3afc59b681ca6890..1b9d9e447b76d4d42d15ab40e6a4ea5943648ee1 100644 (file)
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -21,19 +21,19 @@ typedef bool (*check_idle_t)(void *userdata);
 
 int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout, check_idle_t check_idle, void *userdata);
 
-int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error);
+int bus_name_has_owner(sd_bus *bus, const char *name, sd_bus_error *reterr_error);
 
 bool bus_error_is_unknown_service(const sd_bus_error *error);
 bool bus_error_is_connection(const sd_bus_error *error);
 
-int bus_check_peercred(sd_bus *c);
+int bus_check_peercred(sd_bus *bus);
 
 int bus_set_address_capsule_bus(sd_bus *bus, const char *capsule, int *ret_pin_fd);
 
-int bus_connect_system_systemd(sd_bus **ret_bus);
-int bus_connect_user_systemd(sd_bus **ret_bus);
-int bus_connect_capsule_systemd(const char *capsule, sd_bus **ret_bus);
-int bus_connect_capsule_bus(const char *capsule, sd_bus **ret_bus);
+int bus_connect_system_systemd(sd_bus **ret);
+int bus_connect_user_systemd(sd_bus **ret);
+int bus_connect_capsule_systemd(const char *capsule, sd_bus **ret);
+int bus_connect_capsule_bus(const char *capsule, sd_bus **ret);
 
 int bus_connect_transport(BusTransport transport, const char *host, RuntimeScope runtime_scope, sd_bus **bus);
 int bus_connect_transport_systemd(BusTransport transport, const char *host, RuntimeScope runtime_scope, sd_bus **bus);
@@ -62,7 +62,7 @@ static inline int bus_open_system_watch_bind(sd_bus **ret) {
         return bus_open_system_watch_bind_with_description(ret, NULL);
 }
 
-int bus_reply_pair_array(sd_bus_message *m, char **l);
+int bus_reply_pair_array(sd_bus_message *m, char * const *l);
 
 /* Listen to GetMallocInfo() calls to 'destination' and return malloc_info() via FD */
 int bus_register_malloc_status(sd_bus *bus, const char *destination);

diff --git a/src/shared/bus-wait-for-jobs.c b/src/shared/bus-wait-for-jobs.c
index 2526e2511fce6658c8e7b3f2106f107e35119194..e8a5b4cee141c78104d350329faf1ea9de29b418 100644 (file)
--- a/src/shared/bus-wait-for-jobs.c
+++ b/src/shared/bus-wait-for-jobs.c
@@ -45,7 +45,7 @@ BusWaitForJobs* bus_wait_for_jobs_free(BusWaitForJobs *d) {
         return mfree(d);
 }
 
-static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *error) {
+static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *reterr_error) {
         assert(m);
 
         log_warning("D-Bus connection terminated while waiting for jobs.");
@@ -54,7 +54,7 @@ static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *e
         return 0;
 }
 
-static int match_job_removed(sd_bus_message *m, void *userdata, sd_bus_error *error) {
+static int match_job_removed(sd_bus_message *m, void *userdata, sd_bus_error *reterr_error) {
         BusWaitForJobs *d = ASSERT_PTR(userdata);
         _cleanup_free_ char *job_found = NULL;
         const char *path, *unit, *result;

diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index 9730a6c738eed6846123c191912953f9a7457783..d4f78e3269ab21a5da376665af7cde0226863ae4 100644 (file)
--- a/src/shared/bus-wait-for-units.c
+++ b/src/shared/bus-wait-for-units.c
@@ -40,7 +40,7 @@ typedef struct BusWaitForUnits {
         bool has_failed:1;
 } BusWaitForUnits;
 
-static WaitForItem *wait_for_item_free(WaitForItem *item) {
+static WaitForItem* wait_for_item_free(WaitForItem *item) {
         int r;
 
         if (!item)
@@ -99,7 +99,7 @@ static void bus_wait_for_units_clear(BusWaitForUnits *d) {
         d->items = hashmap_free(d->items);
 }
 
-static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *error) {
+static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *reterr_error) {
         BusWaitForUnits *d = ASSERT_PTR(userdata);
 
         assert(m);
@@ -228,7 +228,7 @@ static int wait_for_item_parse_properties(WaitForItem *item, sd_bus_message *m)
         return 0;
 }
 
-static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error *error) {
+static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error *reterr_error) {
         WaitForItem *item = ASSERT_PTR(userdata);
         const char *interface;
         int r;
@@ -249,7 +249,7 @@ static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error
         return 0;
 }
 
-static int on_get_all_properties(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+static int on_get_all_properties(sd_bus_message *m, void *userdata, sd_bus_error *reterr_error) {
         WaitForItem *item = ASSERT_PTR(userdata);
         const sd_bus_error *e;
         int r;

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index add30e3cf2d39da2f74cba86a8ff5d96bcef8a2b..a717f3b0bd6968269d9a21d6d8f09e1c20e14e80 100644 (file)
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -915,7 +915,7 @@ static int shutdown_vm_graceful(sd_event_source *s, const struct signalfd_siginf
                 goto fallback;
         }
 
-        r = bus_call_method(bus, bus_login_mgr, "PowerOff", &error, /* reply= */ NULL, "b", false);
+        r = bus_call_method(bus, bus_login_mgr, "PowerOff", &error, /* ret_reply= */ NULL, "b", false);
         if (r >= 0) {
                 log_info("Requested powering off VM through D-Bus.");
                 return 0;
@@ -924,7 +924,7 @@ static int shutdown_vm_graceful(sd_event_source *s, const struct signalfd_siginf
         log_warning_errno(r, "Failed to shutdown VM via logind, ignoring: %s", bus_error_message(&error, r));
         sd_bus_error_free(&error);
 
-        r = bus_call_method(bus, bus_systemd_mgr, "PowerOff", &error, /* reply= */ NULL, /* types= */ NULL);
+        r = bus_call_method(bus, bus_systemd_mgr, "PowerOff", &error, /* ret_reply= */ NULL, /* types= */ NULL);
         if (r >= 0) {
                 log_info("Requested powering off VM through D-Bus.");
                 return 0;