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

core: drop duplicate code searching for match in nm_match_spec_device()

Browse Source 
When searching for "*", we still need to check for higher priority
"except:" matches. But don't duplicate the search loop and just
proceed with the regular searched.

It already has the "if (!except && match == NM_MATCH_SPEC_MATCH)" which
short-cuts the search.
This commit is contained in:
Thomas Haller
2017-01-23 09:35:50 +01:00
parent 0d6885cfa3
commit 9fff9f501a
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/nm-core-utils.c
View File

@@ -1370,6 +1370,9 @@ match_device_eval (const char *spec_str,
gboolean allow_fuzzy, gboolean allow_fuzzy,
MatchDeviceData *match_data) MatchDeviceData *match_data)
{ {
if (spec_str[0] == '*' && spec_str[1] == '\0')
return TRUE;
if (_MATCH_CHECK (spec_str, DEVICE_TYPE_TAG)) { if (_MATCH_CHECK (spec_str, DEVICE_TYPE_TAG)) {
return match_data->device_type return match_data->device_type
&& nm_streq (spec_str, match_data->device_type); && nm_streq (spec_str, match_data->device_type);
@@ -1439,36 +1442,18 @@ nm_match_spec_device (const GSList *specs,
if (!specs) if (!specs)
return NM_MATCH_SPEC_NO_MATCH; return NM_MATCH_SPEC_NO_MATCH;
/* first see if there is an all-match "*" */
for (iter = specs; iter; iter = iter->next) {
spec_str = iter->data;
if (!spec_str || spec_str[0] != '*' || spec_str[1] != '\0')
continue;
/* we have a match-all. See if there is a matching except
* which can still change the outcome... */
for (iter = specs; iter; iter = iter->next) {
spec_str = iter->data;
if (!spec_str || !*spec_str)
continue;
spec_str = match_except (spec_str, &except);
if (!except)
continue;
if (!match_device_eval (spec_str,
FALSE,
&match_data))
continue;
return NM_MATCH_SPEC_NEG_MATCH;
}
return NM_MATCH_SPEC_MATCH;
}
match = NM_MATCH_SPEC_NO_MATCH; match = NM_MATCH_SPEC_NO_MATCH;
/* pre-search for "*" */
for (iter = specs; iter; iter = iter->next) {
spec_str = iter->data;
if (spec_str && spec_str[0] == '*' && spec_str[1] == '\0') {
match = NM_MATCH_SPEC_MATCH;
break;
}
}
for (iter = specs; iter; iter = iter->next) { for (iter = specs; iter; iter = iter->next) {
spec_str = iter->data; spec_str = iter->data;