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/busctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsystemd/sd-bus/busctl.c') diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c index f06b74505b..fdc275ce46 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c @@ -142,7 +142,7 @@ static int list_bus_names(sd_bus *bus, char **argv) { printf("%-*s", (int) max_i, *i); - r = sd_bus_get_owner(bus, *i, + r = sd_bus_get_name_creds(bus, *i, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM| SD_BUS_CREDS_UNIQUE_NAME|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_SESSION| SD_BUS_CREDS_CONNECTION_NAME, &creds); @@ -210,7 +210,7 @@ static int list_bus_names(sd_bus *bus, char **argv) { printf(" - - - - - - - "); if (arg_show_machine) { - r = sd_bus_get_owner_machine_id(bus, *i, &mid); + r = sd_bus_get_name_machine_id(bus, *i, &mid); if (r >= 0) { char m[SD_ID128_STRING_MAX]; printf(" %s\n", sd_id128_to_string(mid, m)); @@ -306,7 +306,7 @@ static int status(sd_bus *bus, char *argv[]) { r = parse_pid(argv[1], &pid); if (r < 0) - r = sd_bus_get_owner(bus, argv[1], _SD_BUS_CREDS_ALL, &creds); + r = sd_bus_get_name_creds(bus, argv[1], _SD_BUS_CREDS_ALL, &creds); else r = sd_bus_creds_new_from_pid(&creds, pid, _SD_BUS_CREDS_ALL); -- cgit v1.2.3-54-g00ecf