diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-11-10 21:40:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-11-10 21:40:47 +0100 |
| commit | 459b9f9ff7852144cf3ba380d9374acb3d46b328 (patch) | |
| tree | 388b89999debf9b041f8639ee52061f66a791b4f /src/machine | |
| parent | 0b3c84eb7da3a8c28ac248a68228f6a7edbb2e19 (diff) | |
| download | systemd-459b9f9ff7852144cf3ba380d9374acb3d46b328.tar.gz | |
merge two lines in our get_output_flags() functions
loginctl, machinectl, systemctl all have very similar implementations of
a get_output_flags() functions. Simplify it by merging two lines that
set the same flag.
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machinectl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 8d78a0d3c0..968be322dd 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -93,8 +93,7 @@ static int print_addresses(sd_bus *bus, const char *name, int, const char *pr1, static OutputFlags get_output_flags(void) { return arg_all * OUTPUT_SHOW_ALL | - arg_full * OUTPUT_FULL_WIDTH | - (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | + (arg_full || !on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | colors_enabled() * OUTPUT_COLOR | !arg_quiet * OUTPUT_WARN_CUTOFF; } |