colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: fix parsing aliases for flags in _nm_utils_enum_from_str_full()

Browse Source 
Otherwise, the last alias overwrites previous values.

Fixes: b9fa0e0a19
This commit is contained in:
Thomas Haller
2018-05-29 11:26:11 +02:00
parent daf4ba43da
commit 3c6bd6769b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libnm-core/tests/test-general.c
View File

@@ -6531,7 +6531,8 @@ test_nm_utils_enum (void)
_test_nm_utils_enum_from_str_do_full (color_flags, _test_nm_utils_enum_from_str_do_full (color_flags,
"nick-4d,nick-red,nick-5,green,nick-red", "nick-4d,nick-red,nick-5,green,nick-red",
TRUE, TRUE,
NM_TEST_GENERAL_COLOR_FLAGS_RED, 0x4D
| NM_TEST_GENERAL_COLOR_FLAGS_GREEN,
NULL, NULL,
color_value_infos); color_value_infos);

2
shared/nm-utils/nm-enum-utils.c
View File

@@ -243,7 +243,7 @@ _nm_utils_enum_from_str_full (GType type,
else { else {
nick = _find_value_info (value_infos, s); nick = _find_value_info (value_infos, s);
if (nick) if (nick)
uvalue = (unsigned) nick->value; uvalue |= (unsigned) nick->value;
else { else {
ret = FALSE; ret = FALSE;
break; break;