diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-03-14 17:48:29 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-03-19 21:04:02 +0900 |
commit | ee5324aa04bb46a9a8e1ad23307efa85e05879b6 (patch) | |
tree | 85cd5851f9d9139c25291f08f04307b1340e58a3 | |
parent | 24fcd009c3eb89f590bef96dd5495fd4ef796fd0 (diff) | |
download | systemd-ee5324aa04bb46a9a8e1ad23307efa85e05879b6.tar.gz |
tree-wide: voidify pager_open()
Even if pager_open() fails, in general, we should continue the operations.
All erroneous cases in pager_open() show log message in the function.
So, it is not necessary to check the returned value.
-rw-r--r-- | src/analyze/analyze.c | 10 | ||||
-rw-r--r-- | src/busctl/busctl.c | 14 | ||||
-rw-r--r-- | src/cgls/cgls.c | 8 | ||||
-rw-r--r-- | src/core/main.c | 2 | ||||
-rw-r--r-- | src/coredump/coredumpctl.c | 2 | ||||
-rw-r--r-- | src/delta/delta.c | 2 | ||||
-rw-r--r-- | src/journal/journalctl.c | 8 | ||||
-rw-r--r-- | src/locale/localectl.c | 6 | ||||
-rw-r--r-- | src/login/loginctl.c | 12 | ||||
-rw-r--r-- | src/machine/machinectl.c | 12 | ||||
-rw-r--r-- | src/mount/mount-tool.c | 2 | ||||
-rw-r--r-- | src/network/networkctl.c | 6 | ||||
-rw-r--r-- | src/resolve/resolve-tool.c | 4 | ||||
-rw-r--r-- | src/systemctl/systemctl.c | 26 | ||||
-rw-r--r-- | src/timedate/timedatectl.c | 2 |
15 files changed, 57 insertions, 59 deletions
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 092ff763ba..1bed16e219 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1027,7 +1027,7 @@ static int analyze_critical_chain(int argc, char *argv[], void *userdata) { } unit_times_hashmap = h; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); puts("The time after the unit is active or started is printed after the \"@\" character.\n" "The time the unit takes to start is printed after the \"+\" character.\n"); @@ -1060,7 +1060,7 @@ static int analyze_blame(int argc, char *argv[], void *userdata) { qsort(times, n, sizeof(struct unit_times), compare_unit_time); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); for (i = 0; i < (unsigned) n; i++) { char ts[FORMAT_TIMESPAN_MAX]; @@ -1283,7 +1283,7 @@ static int dump(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to create bus connection: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method( bus, @@ -1445,7 +1445,7 @@ static void dump_syscall_filter(const SyscallFilterSet *set) { static int dump_syscall_filters(int argc, char *argv[], void *userdata) { bool first = true; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (strv_isempty(strv_skip(argv, 1))) { int i; @@ -1607,7 +1607,7 @@ static int do_verify(int argc, char *argv[], void *userdata) { static int help(int argc, char *argv[], void *userdata) { - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Profile systemd, show unit dependencies, check unit files.\n\n" diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index ae4c8c26c0..2f9250e2ae 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -167,7 +167,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to list names: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); names = hashmap_new(&string_hash_ops); if (!names) @@ -482,7 +482,7 @@ static int tree_one(sd_bus *bus, const char *service, const char *prefix, bool m p = NULL; } - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); l = set_get_strv(done); if (!l) @@ -516,7 +516,7 @@ static int tree(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to get name list: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); STRV_FOREACH(i, names) { int q; @@ -546,7 +546,7 @@ static int tree(int argc, char **argv, void *userdata) { printf("\n"); if (argv[2]) { - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); printf("Service %s%s%s:\n", ansi_highlight(), *i, ansi_normal()); } @@ -1052,7 +1052,7 @@ static int introspect(int argc, char **argv, void *userdata) { return bus_log_parse_error(r); } - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); name_width = STRLEN("NAME"); type_width = STRLEN("TYPE"); @@ -1662,7 +1662,7 @@ static int call(int argc, char **argv, void *userdata) { if (r == 0 && !arg_quiet) { if (arg_verbose) { - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = bus_message_dump(reply, stdout, 0); if (r < 0) @@ -1713,7 +1713,7 @@ static int get_property(int argc, char **argv, void *userdata) { return bus_log_parse_error(r); if (arg_verbose) { - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_SUBTREE_ONLY); if (r < 0) diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index bd8c6a0059..1e92dabe0c 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -176,11 +176,9 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - if (!arg_no_pager) { - r = pager_open(arg_no_pager, false); - if (r > 0 && arg_full < 0) - arg_full = true; - } + r = pager_open(arg_no_pager, false); + if (r > 0 && arg_full < 0) + arg_full = true; output_flags = arg_all * OUTPUT_SHOW_ALL | diff --git a/src/core/main.c b/src/core/main.c index 4b2d149237..a4d2cdf759 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2326,7 +2326,7 @@ int main(int argc, char *argv[]) { goto finish; if (IN_SET(arg_action, ACTION_TEST, ACTION_HELP, ACTION_DUMP_CONFIGURATION_ITEMS)) - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (arg_action != ACTION_RUN) skip_setup = true; diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c index 2795f5b675..2f8b9b7cbf 100644 --- a/src/coredump/coredumpctl.c +++ b/src/coredump/coredumpctl.c @@ -658,7 +658,7 @@ static int dump_list(int argc, char **argv, void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); /* The coredumps are likely to compressed, and for just * listing them we don't need to decompress them, so let's diff --git a/src/delta/delta.c b/src/delta/delta.c index 4fe89ff9b0..49d9f0bb03 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -662,7 +662,7 @@ int main(int argc, char *argv[]) { else if (arg_diff) arg_flags |= SHOW_OVERRIDDEN; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (optind < argc) { int i; diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index e0ad0e1d11..3c9c6df07d 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -316,7 +316,7 @@ static int parse_boot_descriptor(const char *x, sd_id128_t *boot_id, int *offset static void help(void) { - pager_open(arg_no_pager, arg_pager_end); + (void) pager_open(arg_no_pager, arg_pager_end); printf("%s [OPTIONS...] [MATCHES...]\n\n" "Query the journal.\n\n" @@ -1369,7 +1369,7 @@ static int list_boots(sd_journal *j) { if (count == 0) return count; - pager_open(arg_no_pager, arg_pager_end); + (void) pager_open(arg_no_pager, arg_pager_end); /* numbers are one less, but we need an extra char for the sign */ w = DECIMAL_STR_WIDTH(count - 1) + 1; @@ -2135,7 +2135,7 @@ int main(int argc, char *argv[]) { } else { bool oneline = arg_action == ACTION_LIST_CATALOG; - pager_open(arg_no_pager, arg_pager_end); + (void) pager_open(arg_no_pager, arg_pager_end); if (optind < argc) r = catalog_list_items(stdout, database, oneline, argv + optind); @@ -2492,7 +2492,7 @@ int main(int argc, char *argv[]) { need_seek = true; if (!arg_follow) - pager_open(arg_no_pager, arg_pager_end); + (void) pager_open(arg_no_pager, arg_pager_end); if (!arg_quiet && (arg_lines != 0 || arg_follow)) { usec_t start, end; diff --git a/src/locale/localectl.c b/src/locale/localectl.c index e67ba4e7e0..f50d31a29b 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -223,7 +223,7 @@ static int list_locales(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to read list of locales: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); strv_print(l); return 0; @@ -265,7 +265,7 @@ static int list_vconsole_keymaps(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to read list of keymaps: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); strv_print(l); @@ -391,7 +391,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { strv_sort(list); strv_uniq(list); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); strv_print(list); return 0; diff --git a/src/login/loginctl.c b/src/login/loginctl.c index c811ee6c5e..2f53a2740d 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -111,7 +111,7 @@ static int list_sessions(int argc, char *argv[], void *userdata) { assert(bus); assert(argv); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method( bus, @@ -186,7 +186,7 @@ static int list_users(int argc, char *argv[], void *userdata) { assert(bus); assert(argv); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method( bus, @@ -231,7 +231,7 @@ static int list_seats(int argc, char *argv[], void *userdata) { assert(bus); assert(argv); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method( bus, @@ -903,7 +903,7 @@ static int show_session(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (argc <= 1) { const char *session, *p = "/org/freedesktop/login1/session/self"; @@ -955,7 +955,7 @@ static int show_user(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (argc <= 1) { /* If not argument is specified inspect the manager @@ -1015,7 +1015,7 @@ static int show_seat(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (argc <= 1) { /* If not argument is specified inspect the manager diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index e695bdbab4..9180ec4725 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -207,7 +207,7 @@ static int list_machines(int argc, char *argv[], void *userdata) { assert(bus); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method(bus, "org.freedesktop.machine1", @@ -363,7 +363,7 @@ static int list_images(int argc, char *argv[], void *userdata) { assert(bus); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method(bus, "org.freedesktop.machine1", @@ -860,7 +860,7 @@ static int show_machine(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (properties && argc <= 1) { @@ -1213,7 +1213,7 @@ static int show_image(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (argc <= 1) { @@ -2543,7 +2543,7 @@ static int list_transfers(int argc, char *argv[], void *userdata) { double progress; int r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_call_method(bus, "org.freedesktop.import1", @@ -2758,7 +2758,7 @@ static int clean_images(int argc, char *argv[], void *userdata) { } static int help(int argc, char *argv[], void *userdata) { - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Send control commands to or query the virtual machine and container\n" diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 0cd9f07094..dd139740c2 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -1529,7 +1529,7 @@ static int list_devices(void) { qsort_safe(items, n, sizeof(struct item), compare_item); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); fputs(ansi_underline(), stdout); for (c = 0; c < _COLUMN_MAX; c++) { diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 50317e948d..362f671417 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -273,7 +273,7 @@ static int list_links(int argc, char *argv[], void *userdata) { if (c < 0) return c; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (arg_legend) printf("%3s %-16s %-18s %-11s %-10s\n", @@ -897,7 +897,7 @@ static int link_status(int argc, char *argv[], void *userdata) { _cleanup_free_ LinkInfo *links = NULL; int r, c, i; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_netlink_open(&rtnl); if (r < 0) @@ -993,7 +993,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { if (c < 0) return c; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (arg_legend) printf("%-16s %-17s %-16s %-11s %-17s %-16s\n", diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c index 04f883654a..d1395b2e2c 100644 --- a/src/resolve/resolve-tool.c +++ b/src/resolve/resolve-tool.c @@ -1241,7 +1241,7 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt goto finish; } - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (*empty_line) fputc('\n', stdout); @@ -1450,7 +1450,7 @@ static int status_global(sd_bus *bus, bool *empty_line) { goto finish; } - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); printf("%sGlobal%s\n", ansi_highlight(), ansi_normal()); STRV_FOREACH(i, global_info.dns) { diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 0f383ec9e0..7bd5ecbb40 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -791,7 +791,7 @@ static int list_units(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = get_unit_list_recursive(bus, strv_skip(argv, 1), &unit_infos, &replies, &machines); if (r < 0) @@ -1003,7 +1003,7 @@ static int list_sockets(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); n = get_unit_list_recursive(bus, strv_skip(argv, 1), &unit_infos, &replies, &machines); if (n < 0) @@ -1310,7 +1310,7 @@ static int list_timers(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); n = get_unit_list_recursive(bus, strv_skip(argv, 1), &unit_infos, &replies, &machines); if (n < 0) @@ -1599,7 +1599,7 @@ static int list_unit_files(int argc, char *argv[], void *userdata) { return bus_log_parse_error(r); } - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); qsort_safe(units, c, sizeof(UnitFileList), compare_unit_file_list); output_unit_file_list(units, c); @@ -1854,7 +1854,7 @@ static int list_dependencies(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); puts(u); @@ -2086,7 +2086,7 @@ static int list_machines(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); qsort_safe(machine_infos, r, sizeof(struct machine_info), compare_machine_info); output_machines_list(machine_infos, r); @@ -2258,7 +2258,7 @@ static void output_jobs_list(sd_bus *bus, const struct job_info* jobs, unsigned return; } - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); id_len = STRLEN("JOB"); unit_len = STRLEN("UNIT"); @@ -2373,7 +2373,7 @@ static int list_jobs(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_parse_error(r); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); output_jobs_list(bus, jobs, c, skipped); return 0; @@ -5325,7 +5325,7 @@ static int show_all( if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); c = (unsigned) r; @@ -5427,7 +5427,7 @@ static int show(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); if (show_status) /* Increase max number of open files to 16K if we can, we @@ -5555,7 +5555,7 @@ static int cat(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to expand names: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); STRV_FOREACH(name, names) { _cleanup_free_ char *fragment_path = NULL; @@ -5834,7 +5834,7 @@ static int show_environment(int argc, char *argv[], void *userdata) { if (r < 0) return r; - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); r = sd_bus_get_property( bus, @@ -7220,7 +7220,7 @@ end: static void systemctl_help(void) { - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Query or send control commands to the systemd manager.\n\n" diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index cd1e00a196..d390e24e62 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -283,7 +283,7 @@ static int list_timezones(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to read list of time zones: %m"); - pager_open(arg_no_pager, false); + (void) pager_open(arg_no_pager, false); strv_print(zones); return 0; |