diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-11-05 14:57:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 14:57:30 +0100 |
| commit | 8389fd19d20370077f2d5601af0a089ec92ece05 (patch) | |
| tree | 15402f17ca3b5fced203a7b8b3c79e8d6fe936e0 /src/busctl | |
| parent | meson-render-jinja2: use ast.literal_eval() (diff) | |
| parent | Make pager_open() return void (diff) | |
| download | systemd-8389fd19d20370077f2d5601af0a089ec92ece05.tar.xz systemd-8389fd19d20370077f2d5601af0a089ec92ece05.zip | |
Merge pull request #20138 from keszybz/coding-style-variable-decls
A coding style tweak and checking of sd_notify() calls and voidification of pager_open()
Diffstat (limited to 'src/busctl')
| -rw-r--r-- | src/busctl/busctl.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index b5cd9749cc..c0c9b23ae9 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -486,7 +486,7 @@ static int tree_one(sd_bus *bus, const char *service) { return log_oom(); } - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); l = set_get_strv(done); if (!l) @@ -526,7 +526,7 @@ static int tree(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to get name list: %m"); - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); STRV_FOREACH(i, names) { int q; @@ -556,7 +556,7 @@ static int tree(int argc, char **argv, void *userdata) { printf("\n"); if (argv[2]) { - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); printf("Service %s%s%s:\n", ansi_highlight(), *i, ansi_normal()); } @@ -979,7 +979,7 @@ static int introspect(int argc, char **argv, void *userdata) { if (arg_xml_interface) { /* Just dump the received XML and finish */ - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); puts(xml); return 0; } @@ -1098,7 +1098,7 @@ static int introspect(int argc, char **argv, void *userdata) { typesafe_qsort(sorted, k, member_compare_funcp); - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); if (arg_legend) printf("%-*s %-*s %-*s %-*s %s\n", @@ -1358,7 +1358,7 @@ static int status(int argc, char **argv, void *userdata) { if (r < 0) return r; - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); if (!isempty(argv[1])) { r = parse_pid(argv[1], &pid); @@ -2038,7 +2038,7 @@ static int call(int argc, char **argv, void *userdata) { _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; if (arg_json_format_flags & (JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO)) - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); r = json_transform_message(reply, &v); if (r < 0) @@ -2047,7 +2047,7 @@ static int call(int argc, char **argv, void *userdata) { json_variant_dump(v, arg_json_format_flags, NULL, NULL); } else if (arg_verbose) { - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); r = sd_bus_message_dump(reply, stdout, 0); if (r < 0) @@ -2147,7 +2147,7 @@ static int get_property(int argc, char **argv, void *userdata) { _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; if (arg_json_format_flags & (JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO)) - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); r = json_transform_variant(reply, contents, &v); if (r < 0) @@ -2156,7 +2156,7 @@ static int get_property(int argc, char **argv, void *userdata) { json_variant_dump(v, arg_json_format_flags, NULL, NULL); } else if (arg_verbose) { - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); r = sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY); if (r < 0) @@ -2233,7 +2233,7 @@ static int help(void) { if (r < 0) return log_oom(); - (void) pager_open(arg_pager_flags); + pager_open(arg_pager_flags); printf("%s [OPTIONS...] COMMAND ...\n\n" "%sIntrospect the D-Bus IPC bus.%s\n" |