diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-01-21 17:39:01 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-01-21 18:14:21 +0100 |
commit | 665ffc7fba3222271ccce2b7e010663a3bfe4533 (patch) | |
tree | a07e327723049b0c6b6b1b2f8221056403541157 /src/busctl/busctl.c | |
parent | e676b4fc8bbf1e7e602d839721b092fd58aacc05 (diff) | |
download | systemd-665ffc7fba3222271ccce2b7e010663a3bfe4533.tar.gz |
busctl/homectl: port the obvious cases to table_print_with_pager()
Diffstat (limited to 'src/busctl/busctl.c')
-rw-r--r-- | src/busctl/busctl.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 276cae1b8b..15e855062f 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -239,8 +239,6 @@ static int list_bus_names(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to set columns to display: %m"); - table_set_header(table, arg_legend); - HASHMAP_FOREACH_KEY(v, k, names) { _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; @@ -357,14 +355,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) { return log_error_errno(r, "Failed to fill line: %m"); } - if (arg_json_format_flags & (JSON_FORMAT_OFF|JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO)) - (void) pager_open(arg_pager_flags); - - r = table_print_json(table, NULL, arg_json_format_flags); - if (r < 0) - return table_log_print_error(r); - - return 0; + return table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend); } static void print_subtree(const char *prefix, const char *path, char **l) { |