From aeb81183de7fe51a3a85a0559fe69523e59f68cc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 3 Jun 2020 18:35:07 +0200 Subject: [PATCH] core: drop mask argument from nm_settings_connection_autoconnect_blocked_reason_get() 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) --- src/nm-manager.c | 4 ++-- src/settings/nm-settings-connection.c | 7 +++---- src/settings/nm-settings-connection.h | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index e8b3d7eff..f687a144f 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4717,8 +4717,8 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError * } if ( nm_active_connection_get_activation_reason (active) == NM_ACTIVATION_REASON_AUTOCONNECT - && nm_settings_connection_autoconnect_blocked_reason_get (parent_con, - NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) { + && NM_FLAGS_HAS (nm_settings_connection_autoconnect_blocked_reason_get (parent_con), + NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) { 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", nm_device_get_iface (device)); diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 653a80c99..a79e2afaa 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -1495,9 +1495,8 @@ update_auth_cb (NMSettingsConnection *self, /* New secrets, allow autoconnection again */ 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); - } } } @@ -2438,9 +2437,9 @@ NM_UTILS_FLAGS2STR_DEFINE (_autoconnect_blocked_reason_to_string, NMSettingsAuto ); 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 diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index dfc3786c5..ebc46414f 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -337,8 +337,7 @@ void nm_settings_connection_autoconnect_retries_reset (NMSettingsConnection *sel gint32 nm_settings_connection_autoconnect_retries_blocked_until (NMSettingsConnection *self); -NMSettingsAutoconnectBlockedReason nm_settings_connection_autoconnect_blocked_reason_get (NMSettingsConnection *self, - NMSettingsAutoconnectBlockedReason mask); +NMSettingsAutoconnectBlockedReason nm_settings_connection_autoconnect_blocked_reason_get (NMSettingsConnection *self); gboolean nm_settings_connection_autoconnect_blocked_reason_set_full (NMSettingsConnection *self, NMSettingsAutoconnectBlockedReason mask, NMSettingsAutoconnectBlockedReason value);