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/locale | |
parent | 8e143a123276a9636987b08f555603927ca9e186 (diff) | |
download | systemd-0221d68a1317407960ea6f88bd4ebc1781999332.tar.gz |
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/locale')
-rw-r--r-- | src/locale/localectl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/locale/localectl.c b/src/locale/localectl.c index e2a9415138..44e3f13db8 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -24,7 +24,7 @@ #include "verbs.h" #include "virt.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; @@ -199,7 +199,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"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(l); return 0; @@ -241,7 +241,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"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(l); @@ -373,7 +373,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { strv_sort(list); strv_uniq(list); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(list); return 0; @@ -461,7 +461,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_NO_ASK_PASSWORD: |