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

dns-manager: use NM_IN_SET() in condition

Browse source
This commit is contained in:
Thomas Haller 2016-04-03 14:34:58 +02:00
parent fd496fd887
commit 2b394d0092
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dns-manager/nm-dns-manager.c
View file

@ -792,10 +792,10 @@ build_plugin_config_lists (NMDnsManager *self,
*out_dev_configs = g_slist_append (*out_dev_configs, priv->ip6_device_config);
for (iter = priv->configs; iter; iter = g_slist_next (iter)) {
if ( (iter->data != priv->ip4_vpn_config)
&& (iter->data != priv->ip4_device_config)
&& (iter->data != priv->ip6_vpn_config)
&& (iter->data != priv->ip6_device_config))
if (!NM_IN_SET (iter->data, priv->ip4_vpn_config,
priv->ip4_device_config,
priv->ip6_vpn_config,
priv->ip6_device_config))
*out_other_configs = g_slist_append (*out_other_configs, iter->data);
}
}
@ -891,10 +891,10 @@ update_dns (NMDnsManager *self,
merge_one_ip6_config (&rc, priv->ip6_device_config);
for (iter = priv->configs; iter; iter = g_slist_next (iter)) {
if ( (iter->data == priv->ip4_vpn_config)
|| (iter->data == priv->ip4_device_config)
|| (iter->data == priv->ip6_vpn_config)
|| (iter->data == priv->ip6_device_config))
if (NM_IN_SET (iter->data, priv->ip4_vpn_config,
priv->ip4_device_config,
priv->ip6_vpn_config,
priv->ip6_device_config))
continue;
if (NM_IS_IP4_CONFIG (iter->data)) {