From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 13 Feb 2015 14:37:34 +0000 (+0100)
Subject: bus-proxy: rename synthetic_reply_return_strv() to synthetic_reply_method_return_strv()
X-Git-Tag: v219~40
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1433efd219a6df414a1821b3d3d70d86201ed3e4;hp=418e4cb07d56e365b9b77b24d3c851e85940d68b

bus-proxy: rename synthetic_reply_return_strv() to synthetic_reply_method_return_strv()

That way it matches more closely the nomenclature of our other
success reply calls.
---

diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index e47c66714..bc2c0c86f 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -305,7 +305,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
                 /* Let's sort the names list to make it stable */
                 strv_sort(names);
 
-                return synthetic_reply_return_strv(m, names);
+                return synthetic_reply_method_return_strv(m, names);
 
         } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListNames")) {
                 _cleanup_strv_free_ char **names = NULL;
@@ -324,7 +324,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
                 /* Let's sort the names list to make it stable */
                 strv_sort(names);
 
-                return synthetic_reply_return_strv(m, names);
+                return synthetic_reply_method_return_strv(m, names);
 
         } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListQueuedOwners")) {
                 struct kdbus_cmd_list cmd = {
@@ -389,7 +389,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
                 if (err < 0)
                         return synthetic_reply_method_errno(m, err, NULL);
 
-                return synthetic_reply_return_strv(m, owners);
+                return synthetic_reply_method_return_strv(m, owners);
 
         } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "NameHasOwner")) {
                 const char *name;
diff --git a/src/bus-proxyd/synthesize.c b/src/bus-proxyd/synthesize.c
index ab73d6e17..36ffe2930 100644
--- a/src/bus-proxyd/synthesize.c
+++ b/src/bus-proxyd/synthesize.c
@@ -125,7 +125,7 @@ int synthetic_reply_method_return(sd_bus_message *call, const char *types, ...)
         return synthetic_driver_send(call->bus, m);
 }
 
-int synthetic_reply_return_strv(sd_bus_message *call, char **l) {
+int synthetic_reply_method_return_strv(sd_bus_message *call, char **l) {
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         int r;
 
diff --git a/src/bus-proxyd/synthesize.h b/src/bus-proxyd/synthesize.h
index c24a8c8ca..e93e0d34d 100644
--- a/src/bus-proxyd/synthesize.h
+++ b/src/bus-proxyd/synthesize.h
@@ -25,7 +25,8 @@
 
 int synthetic_reply_method_errorf(sd_bus_message *call, const char *name, const char *format, ...);
 int synthetic_reply_method_return(sd_bus_message *call, const char *types, ...);
-int synthetic_reply_return_strv(sd_bus_message *call, char **l);
+int synthetic_reply_method_return_strv(sd_bus_message *call, char **l);
+
 int synthetic_reply_method_error(sd_bus_message *call, const sd_bus_error *e);
 int synthetic_reply_method_errno(sd_bus_message *call, int error, const sd_bus_error *p);
 int synthesize_name_acquired(sd_bus *a, sd_bus *b, sd_bus_message *m);