libnm-core: add _nm_utils_enum_to_str_full()

Unfortunately nm_utils_enum_to_str() doesn't allow to specify the
separator between enum values. Since the function is public API and
can't be modified now, add a new internal function which accepts the
separator as argument.

2 files changed, 27 insertions, 16 deletions

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 5dd777b0ab..f5b4184234 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -183,6 +183,8 @@ gboolean _nm_utils_check_module_file (const char *name,
                                       gpointer user_data,
                                       GError **error);
 
+char *_nm_utils_enum_to_str_full (GType type, int value, const char *sep);
+
 #define NM_UTILS_UUID_TYPE_LEGACY            0
 #define NM_UTILS_UUID_TYPE_VARIANT3          1
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 8a40727483..75581699ab 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -4249,25 +4249,14 @@ int _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option)
 	return -1;
 }
 
-/**
- * nm_utils_enum_to_str:
- * @type: the %GType of the enum
- * @value: the value to be translated
- *
- * Converts an enum value to its string representation. If the enum is a
- * %G_TYPE_FLAGS the function returns a comma-separated list of matching values.
- * If the enum is a %G_TYPE_ENUM and the given value is not valid the
- * function returns %NULL.
- *
- * Returns: a newly allocated string or %NULL
- *
- * Since: 1.2
- */
-char *nm_utils_enum_to_str (GType type, int value)
+char *
+_nm_utils_enum_to_str_full (GType type, int value, const char *sep)
 {
 	GTypeClass *class;
 	char *ret;
 
+	g_return_val_if_fail (sep, NULL);
+
 	class = g_type_class_ref (type);
 
 	if (G_IS_ENUM_CLASS (class)) {
@@ -4286,7 +4275,7 @@ char *nm_utils_enum_to_str (GType type, int value)
 				break;
 
 			if (!first)
-				g_string_append (str, ", ");
+				g_string_append (str, sep);
 			g_string_append (str, flags_value->value_nick);
 
 			value &= ~flags_value->value;
@@ -4301,6 +4290,26 @@ char *nm_utils_enum_to_str (GType type, int value)
 }
 
 /**
+ * nm_utils_enum_to_str:
+ * @type: the %GType of the enum
+ * @value: the value to be translated
+ *
+ * Converts an enum value to its string representation. If the enum is a
+ * %G_TYPE_FLAGS the function returns a comma-separated list of matching values.
+ * If the enum is a %G_TYPE_ENUM and the given value is not valid the
+ * function returns %NULL.
+ *
+ * Returns: a newly allocated string or %NULL
+ *
+ * Since: 1.2
+ */
+char *
+nm_utils_enum_to_str (GType type, int value)
+{
+	return _nm_utils_enum_to_str_full (type, value, ", ");
+}
+
+/**
  * nm_utils_enum_from_str:
  * @type: the %GType of the enum
  * @str: the input string