From 5e1a7ffb396b3a8b813f85634b830f10471342db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Wed, 22 Apr 2015 11:46:55 +0200
Subject: [PATCH] cli: add @brackets parameter to nmc_util_strv_for_display

---
 clients/cli/connections.c | 2 +-
 clients/cli/utils.c       | 8 +++++---
 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 6b5bcd0643..7103cf24b6 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -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);
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 1cbf611e25..727e309d1c 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -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);
 }
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 3088846e5d..6defb1de14 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -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);