sd-bus: prefix return arguments with 'ret_' for sd_bus_message_peek_type

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 15aa16a788eb596f340c5d212cd9849a445ea618..8eff8781ab2cae1518155521319375249d3276e5 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -3180,7 +3180,7 @@ static void message_quit_container(sd_bus_message *m) {
         c->index = c->saved_index;
 }
 
-_public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents) {
+_public_ int sd_bus_message_peek_type(sd_bus_message *m, char *ret_type, const char **ret_contents) {
         struct bus_container *c;
         int r;
 
@@ -3196,16 +3196,16 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
         c = message_get_last_container(m);
 
         if (bus_type_is_basic(c->signature[c->index])) {
-                if (contents)
-                        *contents = NULL;
-                if (type)
-                        *type = c->signature[c->index];
+                if (ret_contents)
+                        *ret_contents = NULL;
+                if (ret_type)
+                        *ret_type = c->signature[c->index];
                 return 1;
         }
 
         if (c->signature[c->index] == SD_BUS_TYPE_ARRAY) {
 
-                if (contents) {
+                if (ret_contents) {
                         size_t l;
 
                         r = signature_element_length(c->signature+c->index+1, &l);
@@ -3220,18 +3220,18 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
                                              c->signature + c->index + 1, l) < 0)
                                 return -ENOMEM;
 
-                        *contents = c->peeked_signature;
+                        *ret_contents = c->peeked_signature;
                 }
 
-                if (type)
-                        *type = SD_BUS_TYPE_ARRAY;
+                if (ret_type)
+                        *ret_type = SD_BUS_TYPE_ARRAY;
 
                 return 1;
         }
 
         if (IN_SET(c->signature[c->index], SD_BUS_TYPE_STRUCT_BEGIN, SD_BUS_TYPE_DICT_ENTRY_BEGIN)) {
 
-                if (contents) {
+                if (ret_contents) {
                         size_t l;
 
                         r = signature_element_length(c->signature+c->index, &l);
@@ -3243,17 +3243,17 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
                                              c->signature + c->index + 1, l - 2) < 0)
                                 return -ENOMEM;
 
-                        *contents = c->peeked_signature;
+                        *ret_contents = c->peeked_signature;
                 }
 
-                if (type)
-                        *type = c->signature[c->index] == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY;
+                if (ret_type)
+                        *ret_type = c->signature[c->index] == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY;
 
                 return 1;
         }
 
         if (c->signature[c->index] == SD_BUS_TYPE_VARIANT) {
-                if (contents) {
+                if (ret_contents) {
                         size_t rindex, l;
                         void *q;
 
@@ -3274,11 +3274,11 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
                         if (!validate_signature(q, l))
                                 return -EBADMSG;
 
-                        *contents = q;
+                        *ret_contents = q;
                 }
 
-                if (type)
-                        *type = SD_BUS_TYPE_VARIANT;
+                if (ret_type)
+                        *ret_type = SD_BUS_TYPE_VARIANT;
 
                 return 1;
         }
@@ -3286,10 +3286,10 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
         return -EINVAL;
 
 eof:
-        if (type)
-                *type = 0;
-        if (contents)
-                *contents = NULL;
+        if (ret_type)
+                *ret_type = 0;
+        if (ret_contents)
+                *ret_contents = NULL;
         return 0;
 }
 

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index a530033055bede8fbd9624fb840617b0d7ca8c33..ad6b36d54c49a82f42122fa045444ca2c18ea0f0 100644 (file)
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -251,7 +251,7 @@ int sd_bus_message_read_strv_extend(sd_bus_message *m, char ***l);
 int sd_bus_message_skip(sd_bus_message *m, const char *types);
 int sd_bus_message_enter_container(sd_bus_message *m, char type, const char *contents);
 int sd_bus_message_exit_container(sd_bus_message *m);
-int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents);
+int sd_bus_message_peek_type(sd_bus_message *m, char *ret_type, const char **ret_contents);
 int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents);
 int sd_bus_message_at_end(sd_bus_message *m, int complete);
 int sd_bus_message_rewind(sd_bus_message *m, int complete);