fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-core: strip nm_utils_enum_from_str() input string

Browse source 
(cherry picked from commit e65854f609)
This commit is contained in:
Beniamino Galvani 2015-07-30 14:07:01 +02:00
parent ea7063dbc2
commit 2757891b57
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm-core/nm-utils.c
View file

@ -3714,14 +3714,16 @@ gboolean nm_utils_enum_from_str (GType type, const char *str,
GTypeClass *class;
gboolean ret = FALSE;
int value = 0;
gs_free char *stripped = NULL;
g_return_val_if_fail (str, FALSE);
stripped = g_strstrip (strdup (str));
class = g_type_class_ref (type);
if (G_IS_ENUM_CLASS (class)) {
GEnumValue *enum_value;
enum_value = g_enum_get_value_by_nick (G_ENUM_CLASS (class), str);
enum_value = g_enum_get_value_by_nick (G_ENUM_CLASS (class), stripped);
if (enum_value) {
value = enum_value->value;
ret = TRUE;
@ -3731,7 +3733,7 @@ gboolean nm_utils_enum_from_str (GType type, const char *str,
gs_strfreev char **strv = NULL;
int i;
strv = g_strsplit (str, ",", 0);
strv = g_strsplit (stripped, ",", 0);
for (i = 0; strv[i]; i++) {
if (!strv[i][0])
continue;

2
libnm-core/tests/test-general.c
View file

@ -4590,12 +4590,14 @@ static void test_nm_utils_enum (void)
NM_TEST_GENERAL_COLOR_FLAGS_GREEN, "red,green");
test_nm_utils_enum_from_str_do (bool_enum, "", FALSE, 0, NULL);
test_nm_utils_enum_from_str_do (bool_enum, " ", FALSE, 0, NULL);
test_nm_utils_enum_from_str_do (bool_enum, "invalid", FALSE, 0, NULL);
test_nm_utils_enum_from_str_do (bool_enum, "yes", TRUE, NM_TEST_GENERAL_BOOL_ENUM_YES, NULL);
test_nm_utils_enum_from_str_do (bool_enum, "no", TRUE, NM_TEST_GENERAL_BOOL_ENUM_NO, NULL);
test_nm_utils_enum_from_str_do (bool_enum, "yes,no", FALSE, 0, NULL);
test_nm_utils_enum_from_str_do (meta_flags, "", TRUE, 0, NULL);
test_nm_utils_enum_from_str_do (meta_flags, " ", TRUE, 0, NULL);
test_nm_utils_enum_from_str_do (meta_flags, "foo", TRUE, NM_TEST_GENERAL_META_FLAGS_FOO, NULL);
test_nm_utils_enum_from_str_do (meta_flags, "foo,baz", TRUE, NM_TEST_GENERAL_META_FLAGS_FOO |
NM_TEST_GENERAL_META_FLAGS_BAZ, NULL);