diff options
Diffstat (limited to 'clients/cli/general.c')
| -rw-r--r-- | clients/cli/general.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/clients/cli/general.c b/clients/cli/general.c index 7c6752a279..732476d25d 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -336,7 +336,7 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl tmpl = nmc_fields_nm_status; tmpl_len = sizeof (nmc_fields_nm_status); - out.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); + out_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); if (error) { g_string_printf (nmc->return_text, _("Error: only these fields are allowed: %s"), fields_all); @@ -354,7 +354,6 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl wwan_hw_enabled = nm_client_wwan_hardware_get_enabled (nmc->client); wwan_enabled = nm_client_wwan_get_enabled (nmc->client); - out.header_name = pretty_header_name ?: _("NetworkManager status"); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -383,7 +382,9 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl g_ptr_array_add (out.output_data, arr); print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, &out); + print_data (&nmc->nmc_config, out_indices, + pretty_header_name ?: _("NetworkManager status"), + 0, &out); return TRUE; } @@ -486,7 +487,7 @@ print_permissions (void *user_data) tmpl = nmc_fields_nm_permissions; tmpl_len = sizeof (nmc_fields_nm_permissions); - out.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); + out_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); if (error) { g_string_printf (nmc->return_text, _("Error: 'general permissions': %s"), error->message); @@ -495,7 +496,6 @@ print_permissions (void *user_data) return FALSE; } - out.header_name = _("NetworkManager permissions"); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -509,7 +509,10 @@ print_permissions (void *user_data) g_ptr_array_add (out.output_data, arr); } print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, &out); + print_data (&nmc->nmc_config, + out_indices, + _("NetworkManager permissions"), + 0, &out); quit (); return G_SOURCE_REMOVE; @@ -598,7 +601,7 @@ show_general_logging (NmCli *nmc) tmpl = nmc_fields_nm_logging; tmpl_len = sizeof (nmc_fields_nm_logging); - out.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); + out_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); if (error) { g_string_printf (nmc->return_text, _("Error: 'general logging': %s"), error->message); @@ -615,7 +618,6 @@ show_general_logging (NmCli *nmc) return FALSE; } - out.header_name = _("NetworkManager logging"); arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -625,7 +627,9 @@ show_general_logging (NmCli *nmc) g_ptr_array_add (out.output_data, arr); print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, &out); + print_data (&nmc->nmc_config, out_indices, + _("NetworkManager logging"), + 0, &out); return TRUE; } |