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

core: drop mask argument from nm_settings_connection_autoconnect_blocked_reason_get()

Browse Source 
We don't need the mask argument. If the caller wants to check only for certain
flags, she can do that right away with

  NM_FLAGS_ANY (nm_settings_connection_autoconnect_blocked_reason_get (sett_con), flags)
This commit is contained in:
Thomas Haller
2020-06-03 18:35:07 +02:00
parent fce4fa1cbf
commit aeb81183de
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-manager.c
View File

@@ -4717,8 +4717,8 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
} }
if ( nm_active_connection_get_activation_reason (active) == NM_ACTIVATION_REASON_AUTOCONNECT if ( nm_active_connection_get_activation_reason (active) == NM_ACTIVATION_REASON_AUTOCONNECT
&& nm_settings_connection_autoconnect_blocked_reason_get (parent_con, && NM_FLAGS_HAS (nm_settings_connection_autoconnect_blocked_reason_get (parent_con),
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) { NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) {
g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED,
"the parent connection of %s cannot autoactivate because it is blocked due to user request", "the parent connection of %s cannot autoactivate because it is blocked due to user request",
nm_device_get_iface (device)); nm_device_get_iface (device));

7
src/settings/nm-settings-connection.c
View File

@@ -1495,9 +1495,8 @@ update_auth_cb (NMSettingsConnection *self,
/* New secrets, allow autoconnection again */ /* New secrets, allow autoconnection again */
if ( nm_settings_connection_autoconnect_blocked_reason_set (self, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, FALSE) if ( nm_settings_connection_autoconnect_blocked_reason_set (self, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, FALSE)
&& !nm_settings_connection_autoconnect_blocked_reason_get (self, 0)) { && !nm_settings_connection_autoconnect_blocked_reason_get (self))
nm_settings_connection_autoconnect_retries_reset (self); nm_settings_connection_autoconnect_retries_reset (self);
}
} }
} }
@@ -2438,9 +2437,9 @@ NM_UTILS_FLAGS2STR_DEFINE (_autoconnect_blocked_reason_to_string, NMSettingsAuto
); );
NMSettingsAutoconnectBlockedReason NMSettingsAutoconnectBlockedReason
nm_settings_connection_autoconnect_blocked_reason_get (NMSettingsConnection *self, NMSettingsAutoconnectBlockedReason mask) nm_settings_connection_autoconnect_blocked_reason_get (NMSettingsConnection *self)
{ {
return NM_SETTINGS_CONNECTION_GET_PRIVATE (self)->autoconnect_blocked_reason & (mask ?: NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL); return NM_SETTINGS_CONNECTION_GET_PRIVATE (self)->autoconnect_blocked_reason;
} }
gboolean gboolean

3
src/settings/nm-settings-connection.h
View File

@@ -337,8 +337,7 @@ void nm_settings_connection_autoconnect_retries_reset (NMSettingsConnection *sel
gint32 nm_settings_connection_autoconnect_retries_blocked_until (NMSettingsConnection *self); gint32 nm_settings_connection_autoconnect_retries_blocked_until (NMSettingsConnection *self);
NMSettingsAutoconnectBlockedReason nm_settings_connection_autoconnect_blocked_reason_get (NMSettingsConnection *self, NMSettingsAutoconnectBlockedReason nm_settings_connection_autoconnect_blocked_reason_get (NMSettingsConnection *self);
NMSettingsAutoconnectBlockedReason mask);
gboolean nm_settings_connection_autoconnect_blocked_reason_set_full (NMSettingsConnection *self, gboolean nm_settings_connection_autoconnect_blocked_reason_set_full (NMSettingsConnection *self,
NMSettingsAutoconnectBlockedReason mask, NMSettingsAutoconnectBlockedReason mask,
NMSettingsAutoconnectBlockedReason value); NMSettingsAutoconnectBlockedReason value);