diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /clients/cli/nmcli.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'clients/cli/nmcli.h')
| -rw-r--r-- | clients/cli/nmcli.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index bcf1c01b..28616855 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -75,7 +75,7 @@ typedef enum { static inline NMMetaAccessorGetType nmc_print_output_to_accessor_get_type (NMCPrintOutput print_output) { - return (print_output != NMC_PRINT_TERSE) + return NM_IN_SET (print_output, NMC_PRINT_NORMAL, NMC_PRINT_PRETTY) ? NM_META_ACCESSOR_GET_TYPE_PRETTY : NM_META_ACCESSOR_GET_TYPE_PARSABLE; } @@ -106,7 +106,7 @@ struct _NmcOutputField { typedef struct _NmcConfig { NMCPrintOutput print_output; /* Output mode */ - gboolean use_colors; /* Whether to use colors for output: option '--color' */ + bool use_colors; /* Whether to use colors for output: option '--color' */ bool multiline_output; /* Multiline output instead of default tabular */ bool escape_values; /* Whether to escape ':' and '\' in terse tabular mode */ bool in_editor; /* Whether running the editor - nmcli con edit' */ |