diff options
| -rw-r--r-- | libnm-core/nm-setting-bond.c | 2 | ||||
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/nm-audit-manager.c | 2 | ||||
| -rw-r--r-- | src/nm-logging.c | 4 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 2 | ||||
| -rw-r--r-- | src/platform/nmp-netns.c | 4 | ||||
| -rw-r--r-- | src/platform/tests/test-link.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 13bb4a8a72..829cda2ef2 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -537,7 +537,7 @@ _nm_setting_bond_option_supported (const char *option, NMBondMode mode) for (i = 0; i < G_N_ELEMENTS (bond_unsupp_modes); i++) { if (nm_streq (option, bond_unsupp_modes[i].option)) - return !NM_FLAGS_HAS (bond_unsupp_modes[i].unsupp_modes, BIT (mode)); + return !NM_FLAGS_ANY (bond_unsupp_modes[i].unsupp_modes, BIT (mode)); } return TRUE; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index fda2126410..62e4a67cff 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12246,7 +12246,7 @@ nm_device_check_connection_available (NMDevice *self, for (i = 0; i <= NM_DEVICE_CHECK_CON_AVAILABLE_ALL; i++) { for (j = 1; j <= NM_DEVICE_CHECK_CON_AVAILABLE_ALL; j <<= 1) { - if (NM_FLAGS_HAS (i, j)) { + if (NM_FLAGS_ANY (i, j)) { k = i & ~j; nm_assert ( available_all[i] == available_all[k] || available_all[i]); diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c index 2d75c0e715..45d068f9ae 100644 --- a/src/nm-audit-manager.c +++ b/src/nm-audit-manager.c @@ -123,7 +123,7 @@ build_message (GPtrArray *fields, AuditBackend backend) for (i = 0; i < fields->len; i++) { field = fields->pdata[i]; - if (!NM_FLAGS_HAS (field->backends, backend)) + if (!NM_FLAGS_ANY (field->backends, backend)) continue; if (first) diff --git a/src/nm-logging.c b/src/nm-logging.c index f19f0de194..4ef786f6e9 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -663,7 +663,7 @@ _nm_log_impl (const char *file, NMLogDomain dom = dom_all & _nm_logging_enabled_state[level]; for (diter = &global.domain_desc[0]; diter->name; diter++) { - if (!NM_FLAGS_HAS (dom_all, diter->num)) + if (!NM_FLAGS_ANY (dom_all, diter->num)) continue; /* construct a list of all domains (not only the enabled ones). @@ -681,7 +681,7 @@ _nm_log_impl (const char *file, g_string_append (s_domain_all, diter->name); } - if (NM_FLAGS_HAS (dom, diter->num)) { + if (NM_FLAGS_ANY (dom, diter->num)) { if (i_domain > 0) { /* SYSLOG_FACILITY is specified multiple times for each domain that is actually enabled. */ _iovec_set_format_a (iov++, _MAX_LEN (30, diter->name), "SYSLOG_FACILITY=%s", diter->name); diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index eac829ff5b..76285dd7d7 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -283,7 +283,7 @@ typedef enum { #define FOR_EACH_DELAYED_ACTION(iflags, flags_all) \ for ((iflags) = (DelayedActionType) 0x1LL; (iflags) <= DELAYED_ACTION_TYPE_MAX; (iflags) <<= 1) \ - if (NM_FLAGS_HAS (flags_all, iflags)) + if (NM_FLAGS_ANY (flags_all, iflags)) typedef enum { /* Negative values are errors from kernel. Add dummy member to diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c index bc305f0170..e31c881d66 100644 --- a/src/platform/nmp-netns.c +++ b/src/platform/nmp-netns.c @@ -200,8 +200,8 @@ _stack_current_ns_types (NMPNetns *netns, int ns_types) } for (i = 0; i < G_N_ELEMENTS (ns_types_check); i++) { - if ( NM_FLAGS_HAS (ns_types, ns_types_check[i]) - && NM_FLAGS_HAS (info->ns_types, ns_types_check[i])) { + if ( NM_FLAGS_ANY (ns_types, ns_types_check[i]) + && NM_FLAGS_ANY (info->ns_types, ns_types_check[i])) { res = NM_FLAGS_SET (res, ns_types_check[i]); ns_types = NM_FLAGS_UNSET (ns_types, ns_types_check[i]); } diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index aedf4a49c2..ad25ea577b 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -2230,7 +2230,7 @@ test_netns_push (gpointer fixture, gconstpointer test_data) p = pl_base; for (j = nstack; j >= 1; ) { j--; - if (NM_FLAGS_HAS (stack[j].ns_types, ns_type)) { + if (NM_FLAGS_ANY (stack[j].ns_types, ns_type)) { p = stack[j].pl; break; } |