diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-11 12:56:29 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-14 16:25:11 +0100 |
| commit | 0221d68a1317407960ea6f88bd4ebc1781999332 (patch) | |
| tree | aa6f7d5c2280c44df790b7c042756c8302a4e788 /src/timedate/timedatectl.c | |
| parent | journalctl: do not treat EINTR as an error when waiting for events (diff) | |
| download | systemd-0221d68a1317407960ea6f88bd4ebc1781999332.tar.xz systemd-0221d68a1317407960ea6f88bd4ebc1781999332.zip | |
basic/pager: convert the pager options to a flags argument
Pretty much everything uses just the first argument, and this doesn't make this
common pattern more complicated, but makes it simpler to pass multiple options.
Diffstat (limited to 'src/timedate/timedatectl.c')
| -rw-r--r-- | src/timedate/timedatectl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 156a6aae6a..d148b45b38 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -21,7 +21,7 @@ #include "util.h" #include "verbs.h" -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_ask_password = true; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; @@ -288,7 +288,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"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(zones); return 0; @@ -791,7 +791,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_NO_PAGER: - arg_no_pager = true; + arg_pager_flags |= PAGER_DISABLE; break; case ARG_MONITOR: |