From 129446ddec0acad88097a008b28418a5efb76e19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 19 Nov 2024 16:27:50 +0100 Subject: [PATCH] busctl: use RET_GATHER --- src/busctl/busctl.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 21f45df6822..557a4571f21 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -550,8 +550,6 @@ static int tree(int argc, char **argv, void *userdata) { char **args = strv_skip(argv, 1); if (args) STRV_FOREACH(arg, args) { - int q; - if (arg != args) puts(""); @@ -560,9 +558,7 @@ static int tree(int argc, char **argv, void *userdata) { printf("Service %s%s%s:\n", ansi_highlight(), *arg, ansi_normal()); } - q = tree_one(bus, *arg); - if (q < 0 && r >= 0) - r = q; + RET_GATHER(r, tree_one(bus, *arg)); } else { _cleanup_strv_free_ char **names = NULL; @@ -574,8 +570,6 @@ static int tree(int argc, char **argv, void *userdata) { pager_open(arg_pager_flags); STRV_FOREACH(name, names) { - int q; - if (!arg_unique && (*name)[0] == ':') continue; @@ -587,9 +581,7 @@ static int tree(int argc, char **argv, void *userdata) { printf("Service %s%s%s:\n", ansi_highlight(), *name, ansi_normal()); - q = tree_one(bus, *name); - if (q < 0 && r >= 0) - r = q; + RET_GATHER(r, tree_one(bus, *name)); } } -- 2.47.3