shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-27 18:04:05 +03:00
Code

busctl: improve readability a bit

Browse Source
This commit is contained in:
Lennart Poettering 2014-11-24 21:39:18 +01:00
parent 5cf4f2d176
commit 1d58a1fe13
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsystemd/sd-bus/busctl.c
View File

@ -67,6 +67,9 @@ static void pager_open_if_enabled(void) {
pager_open(false); pager_open(false);
} }
#define NAME_IS_ACQUIRED INT_TO_PTR(1)
#define NAME_IS_ACTIVATABLE INT_TO_PTR(2)
static int list_bus_names(sd_bus *bus, char **argv) { static int list_bus_names(sd_bus *bus, char **argv) {
_cleanup_strv_free_ char **acquired = NULL, **activatable = NULL; _cleanup_strv_free_ char **acquired = NULL, **activatable = NULL;
_cleanup_free_ char **merged = NULL; _cleanup_free_ char **merged = NULL;
@ -99,7 +102,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {
STRV_FOREACH(i, acquired) { STRV_FOREACH(i, acquired) {
max_i = MAX(max_i, strlen(*i)); max_i = MAX(max_i, strlen(*i));
r = hashmap_put(names, *i, INT_TO_PTR(1)); r = hashmap_put(names, *i, NAME_IS_ACQUIRED);
if (r < 0) { if (r < 0) {
log_error("Failed to add to hashmap: %s", strerror(-r)); log_error("Failed to add to hashmap: %s", strerror(-r));
return r; return r;
@ -109,7 +112,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {
STRV_FOREACH(i, activatable) { STRV_FOREACH(i, activatable) {
max_i = MAX(max_i, strlen(*i)); max_i = MAX(max_i, strlen(*i));
r = hashmap_put(names, *i, INT_TO_PTR(2)); r = hashmap_put(names, *i, NAME_IS_ACTIVATABLE);
if (r < 0 && r != -EEXIST) { if (r < 0 && r != -EEXIST) {
log_error("Failed to add to hashmap: %s", strerror(-r)); log_error("Failed to add to hashmap: %s", strerror(-r));
return r; return r;
@ -137,7 +140,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {
_cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
sd_id128_t mid; sd_id128_t mid;
if (hashmap_get(names, *i) == INT_TO_PTR(2)) { if (hashmap_get(names, *i) == NAME_IS_ACTIVATABLE) {
/* Activatable */ /* Activatable */
printf("%-*s", (int) max_i, *i); printf("%-*s", (int) max_i, *i);