diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-04-22 11:46:55 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-15 10:31:20 +0200 |
| commit | 561f9b720312c88ce65c3c09b0c921aeaed787ae (patch) | |
| tree | 0c808b100e96b41afb42a8c2ca1c42f139e9d504 | |
| parent | 9e65dbd7110f989c6ed8b3de89f93bdf2475b46a (diff) | |
| download | NetworkManager-561f9b720312c88ce65c3c09b0c921aeaed787ae.tar.gz | |
cli: add @brackets parameter to nmc_util_strv_for_display
(cherry picked from commit 5e1a7ffb396b3a8b813f85634b830f10471342db)
| -rw-r--r-- | clients/cli/connections.c | 2 | ||||
| -rw-r--r-- | clients/cli/utils.c | 8 | ||||
| -rw-r--r-- | clients/cli/utils.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 86d09e1c17..ebeec75f21 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -2875,7 +2875,7 @@ check_valid_enumeration (char **str, } else { char *options; - options = nmc_util_strv_for_display (strings); + options = nmc_util_strv_for_display (strings, TRUE); g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("Error: '%s': '%s' is not a valid %s %s."), what, *str, what_desc, options); diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 60cf9f93f5..e7eb2dfdf6 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -544,20 +544,22 @@ nmc_util_strv_to_slist (char **strv) * Returns: a newly allocated string. Caller must free it with g_free(). */ char * -nmc_util_strv_for_display (const char **strv) +nmc_util_strv_for_display (const char **strv, gboolean brackets) { GString *result; guint i = 0; result = g_string_sized_new (150); - g_string_append_c (result, '['); + if (brackets) + g_string_append_c (result, '['); while (strv && strv[i]) { if (result->len > 1) g_string_append (result, ", "); g_string_append (result, strv[i]); i++; } - g_string_append_c (result, ']'); + if (brackets) + g_string_append_c (result, ']'); return g_string_free (result, FALSE); } diff --git a/clients/cli/utils.h b/clients/cli/utils.h index fc43b0ed92..3323fb7357 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -72,7 +72,7 @@ char *nmc_get_user_input (const char *ask_str); int nmc_string_to_arg_array (const char *line, const char *delim, char ***argv, int *argc); const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); GSList *nmc_util_strv_to_slist (char **strv); -char * nmc_util_strv_for_display (const char **strv); +char * nmc_util_strv_for_display (const char **strv, gboolean brackets); char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); int nmc_string_screen_width (const char *start, const char *end); void set_val_str (NmcOutputField fields_array[], guint32 index, char *value); |