fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 13:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add @brackets parameter to nmc_util_strv_for_display

Browse source
This commit is contained in:
Jiří Klimeš 2015-04-22 11:46:55 +02:00
parent db0f5b3b4c
commit 5e1a7ffb39
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/cli/connections.c
View file

@ -2990,7 +2990,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);

8
clients/cli/utils.c
View file

@ -654,20 +654,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);
}

2
clients/cli/utils.h
View file

@ -76,7 +76,7 @@ int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquo
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);