about summary refs log tree commit diff
path: root/clients/cli/nmcli.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-10-20 01:30:31 +0200
committerMichael Biebl <biebl@debian.org>2018-10-20 01:30:31 +0200
commit6518e361171f64bcaaa4bf868139362ed95cc2e0 (patch)
treed2d5b53faf80646a40ec2c0c7f2a42b3959612f5 /clients/cli/nmcli.h
parente126f3e804c35480c4f075777430419d6ece23da (diff)
New upstream version 1.14.2 upstream/1.14.2
Diffstat (limited to 'clients/cli/nmcli.h')
-rw-r--r--clients/cli/nmcli.h4
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' */