From 056f95d0a70413e10e4a4ea9966baabb5a1450ed Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Wed, 22 Oct 2014 19:17:24 +0200 Subject: sd-bus: rename sd_bus_get_owner_uid(), sd_bus_get_owner_machine_id() and sd_bus_get_peer_creds() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clean up the function namespace by renaming the following: sd_bus_get_owner_uid() → sd_bus_get_name_creds_uid() sd_bus_get_owner_machine_id() → sd_bus_get_name_machine_id() sd_bus_get_peer_creds() → sd_bus_get_owner_creds() --- src/libsystemd/sd-bus/bus-control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libsystemd/sd-bus/bus-control.c') diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index b66606763d..96f59f9b36 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -549,7 +549,7 @@ static int bus_populate_creds_from_items(sd_bus *bus, return 0; } -static int bus_get_owner_kdbus( +static int bus_get_name_creds_kdbus( sd_bus *bus, const char *name, uint64_t mask, @@ -627,7 +627,7 @@ fail: return r; } -static int bus_get_owner_dbus1( +static int bus_get_name_creds_dbus1( sd_bus *bus, const char *name, uint64_t mask, @@ -773,7 +773,7 @@ static int bus_get_owner_dbus1( return 0; } -_public_ int sd_bus_get_owner( +_public_ int sd_bus_get_name_creds( sd_bus *bus, const char *name, uint64_t mask, @@ -791,9 +791,9 @@ _public_ int sd_bus_get_owner( return -ENOTCONN; if (bus->is_kernel) - return bus_get_owner_kdbus(bus, name, mask, creds); + return bus_get_name_creds_kdbus(bus, name, mask, creds); else - return bus_get_owner_dbus1(bus, name, mask, creds); + return bus_get_name_creds_dbus1(bus, name, mask, creds); } static int add_name_change_match(sd_bus *bus, @@ -1245,7 +1245,7 @@ int bus_remove_match_internal( return bus_remove_match_internal_dbus1(bus, match); } -_public_ int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { +_public_ int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *m = NULL; const char *mid; int r; -- cgit v1.2.3-54-g00ecf