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/mount | |
| 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/mount')
| -rw-r--r-- | src/mount/mount-tool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 988dbc5fbd..62b910b487 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -36,7 +36,7 @@ enum { } arg_action = ACTION_DEFAULT; static bool arg_no_block = false; -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_ask_password = true; static bool arg_quiet = false; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; @@ -177,7 +177,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: @@ -1485,7 +1485,7 @@ static int list_devices(void) { typesafe_qsort(items, n, compare_item); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); fputs(ansi_underline(), stdout); for (c = 0; c < _COLUMN_MAX; c++) { |