SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
That way it matches more closely the nomenclature of our other
success reply calls.
This commit is contained in:
Lennart Poettering
2015-02-13 15:49:51 +01:00
parent 418e4cb07d
commit 1433efd219
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bus-proxyd/driver.c
+3 -3
View File
@@ -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;
src/bus-proxyd/synthesize.c
+1 -1
View File
@@ -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;
src/bus-proxyd/synthesize.h
+2 -1
View File
@@ -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);