diff options
author | Francesco Giudici <fgiudici@redhat.com> | 2017-01-16 13:54:33 +0100 |
---|---|---|
committer | Francesco Giudici <fgiudici@redhat.com> | 2017-03-28 10:55:00 +0200 |
commit | 7d96f1f17d5aac5035c6d10bcf9691588e873fa9 (patch) | |
tree | af7a07705e132b28aeb57387012fef5911ae5625 | |
parent | 4fa2e1422db23272007b1953fb9b545e303d9716 (diff) | |
download | NetworkManager-7d96f1f17d5aac5035c6d10bcf9691588e873fa9.tar.gz |
nmcli: don't enforce anymore the -f(ields) option in -t(erse) mode
-rw-r--r-- | clients/cli/connections.c | 5 | ||||
-rw-r--r-- | clients/cli/devices.c | 22 | ||||
-rw-r--r-- | clients/cli/general.c | 25 | ||||
-rw-r--r-- | clients/cli/utils.c | 18 | ||||
-rw-r--r-- | clients/cli/utils.h | 1 |
5 files changed, 1 insertions, 70 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index fecec0d403..2578a4963e 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1801,10 +1801,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv) tmpl = nmc_fields_con_show; tmpl_len = sizeof (nmc_fields_con_show); nmc->print_fields.indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &err); - if (err) { - goto finish; - } - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &err)) + if (err) goto finish; /* Add headers */ diff --git a/clients/cli/devices.c b/clients/cli/devices.c index e443b45ad6..c831e35b88 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1494,12 +1494,6 @@ do_devices_status (NmCli *nmc, int argc, char **argv) if (nmc->complete) return nmc->return_value; - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - while (argc > 0) { g_printerr (_("Unknown parameter: %s\n"), *argv); argc--; @@ -3619,14 +3613,6 @@ static NMCCommand device_wifi_cmds[] = { static NMCResultCode do_device_wifi (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - nmc_do_cmd (nmc, device_wifi_cmds, *argv, argc, argv); return nmc->return_value; @@ -3791,14 +3777,6 @@ static NMCCommand device_lldp_cmds[] = { static NMCResultCode do_device_lldp (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - if (!nmc->mode_specified) nmc->multiline_output = TRUE; /* multiline mode is default for 'device lldp' */ diff --git a/clients/cli/general.c b/clients/cli/general.c index 72fefdf83b..c11697350a 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -385,13 +385,6 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl static NMCResultCode do_general_status (NmCli *nmc, int argc, char **argv) { - gs_free_error GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - return NMC_RESULT_ERROR_USER_INPUT; - } - if (nmc->complete) return nmc->return_value; @@ -566,13 +559,6 @@ show_nm_permissions (NmCli *nmc) static NMCResultCode do_general_permissions (NmCli *nmc, int argc, char **argv) { - gs_free_error GError *error = NULL; - - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - return NMC_RESULT_ERROR_USER_INPUT; - } - if (nmc->complete) return nmc->return_value; @@ -655,12 +641,6 @@ do_general_logging (NmCli *nmc, int argc, char **argv) gs_free_error GError *error = NULL; if (argc == 0) { - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - g_error_free (error); - return NMC_RESULT_ERROR_USER_INPUT; - } - if (nmc->complete) return nmc->return_value; @@ -918,17 +898,12 @@ static NMCResultCode do_radio_all (NmCli *nmc, int argc, char **argv) { gboolean enable_flag; - gs_free_error GError *error = NULL; if (argc == 0) { if (nmc->complete) return nmc->return_value; /* no argument, show all radio switches */ - if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), error->message); - return NMC_RESULT_ERROR_USER_INPUT; - } show_nm_status (nmc, _("Radio switches"), NMC_FIELDS_NM_STATUS_RADIO); } else { if (nmc->complete) { diff --git a/clients/cli/utils.c b/clients/cli/utils.c index ac85ad4c98..eeedc25b26 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -941,24 +941,6 @@ nmc_get_allowed_fields (const NmcOutputField fields_array[], int group_idx) return g_string_free (allowed_fields, FALSE); } -gboolean -nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error) -{ - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - if (print_output == NMC_PRINT_TERSE) { - if (!fields) { - g_set_error_literal (error, NMCLI_ERROR, 0, _("Option '--terse' requires specifying '--fields'")); - return FALSE; - } else if ( !strcasecmp (fields, "all") - || !strcasecmp (fields, "common")) { - g_set_error (error, NMCLI_ERROR, 0, _("Option '--terse' requires specific '--fields' option values , not '%s'"), fields); - return FALSE; - } - } - return TRUE; -} - NmcOutputField * nmc_dup_fields_array (NmcOutputField fields[], size_t size, guint32 flags) { diff --git a/clients/cli/utils.h b/clients/cli/utils.h index b3a490904a..b48b86ce39 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -97,7 +97,6 @@ GArray *parse_output_fields (const char *fields_str, GPtrArray **group_fields, GError **error); char *nmc_get_allowed_fields (const NmcOutputField fields_array[], int group_idx); -gboolean nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error); NmcOutputField *nmc_dup_fields_array (NmcOutputField fields[], size_t size, guint32 flags); void nmc_empty_output_fields (NmCli *nmc); void print_required_fields (NmCli *nmc, const NmcOutputField field_values[]); |