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

core: micro optimization in check_connection_compatible() to check for patterns

Browse source 
Let's shortcut the test by consistently checking whether num_patterns
is positive before matching.

It's more about having a consistent form of the "if" checks, than
anything else.
This commit is contained in:
Thomas Haller 2021-03-24 16:42:30 +01:00
parent 8f138e6bc1
commit ccc884d471
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/devices/nm-device.c
View file

@ -7467,11 +7467,10 @@ check_connection_compatible(NMDevice *self, NMConnection *connection, GError **e
s_match = (NMSettingMatch *) nm_connection_get_setting(connection, NM_TYPE_SETTING_MATCH); s_match = (NMSettingMatch *) nm_connection_get_setting(connection, NM_TYPE_SETTING_MATCH);
if (s_match) { if (s_match) {
const char *const *patterns; const char *const *patterns;
const char * device_driver;
guint num_patterns = 0; guint num_patterns = 0;
patterns = nm_setting_match_get_interface_names(s_match, &num_patterns); patterns = nm_setting_match_get_interface_names(s_match, &num_patterns);
if (!nm_wildcard_match_check(device_iface, patterns, num_patterns)) { if (num_patterns > 0 && !nm_wildcard_match_check(device_iface, patterns, num_patterns)) {
nm_utils_error_set_literal(error, nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"device does not satisfy match.interface-name property"); "device does not satisfy match.interface-name property");
@ -7486,9 +7485,9 @@ check_connection_compatible(NMDevice *self, NMConnection *connection, GError **e
error)) error))
return FALSE; return FALSE;
device_driver = nm_device_get_driver(self); patterns = nm_setting_match_get_drivers(s_match, &num_patterns);
patterns = nm_setting_match_get_drivers(s_match, &num_patterns); if (num_patterns > 0
if (!nm_wildcard_match_check(device_driver, patterns, num_patterns)) { && !nm_wildcard_match_check(nm_device_get_driver(self), patterns, num_patterns)) {
nm_utils_error_set_literal(error, nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"device does not satisfy match.driver property"); "device does not satisfy match.driver property");
@ -7496,7 +7495,7 @@ check_connection_compatible(NMDevice *self, NMConnection *connection, GError **e
} }
patterns = nm_setting_match_get_paths(s_match, &num_patterns); patterns = nm_setting_match_get_paths(s_match, &num_patterns);
if (!nm_wildcard_match_check(priv->path, patterns, num_patterns)) { if (num_patterns > 0 && !nm_wildcard_match_check(priv->path, patterns, num_patterns)) {
nm_utils_error_set_literal(error, nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_INCOMPATIBLE, NM_UTILS_ERROR_CONNECTION_AVAILABLE_INCOMPATIBLE,
"device does not satisfy match.path property"); "device does not satisfy match.path property");