diff options
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index b2eccf3767..02397b2b7d 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -988,7 +988,7 @@ _dns_options_get_index (const NMIP6Config *self, const char *option) void nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src) { - NMIP6ConfigPrivate *priv_dst; + NMIP6ConfigPrivate *dst_priv; guint i; gint idx; const NMPlatformIP6Address *a; @@ -1000,15 +1000,15 @@ nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src) g_return_if_fail (src != NULL); g_return_if_fail (dst != NULL); - priv_dst = NM_IP6_CONFIG_GET_PRIVATE (dst); + dst_priv = NM_IP6_CONFIG_GET_PRIVATE (dst); g_object_freeze_notify (G_OBJECT (dst)); /* addresses */ changed = FALSE; nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, src, &a) { - if (nm_dedup_multi_index_remove_obj (priv_dst->multi_idx, - &priv_dst->idx_ip6_addresses, + if (nm_dedup_multi_index_remove_obj (dst_priv->multi_idx, + &dst_priv->idx_ip6_addresses, NMP_OBJECT_UP_CAST (a), NULL)) changed = TRUE; @@ -1037,8 +1037,8 @@ nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src) /* routes */ changed = FALSE; nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, src, &r) { - if (nm_dedup_multi_index_remove_obj (priv_dst->multi_idx, - &priv_dst->idx_ip6_routes, + if (nm_dedup_multi_index_remove_obj (dst_priv->multi_idx, + &dst_priv->idx_ip6_routes, NMP_OBJECT_UP_CAST (r), NULL)) changed = TRUE; @@ -1080,8 +1080,8 @@ nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src) void nm_ip6_config_intersect (NMIP6Config *dst, const NMIP6Config *src) { - NMIP6ConfigPrivate *priv_dst; - const NMIP6ConfigPrivate *priv_src; + NMIP6ConfigPrivate *dst_priv; + const NMIP6ConfigPrivate *src_priv; const struct in6_addr *dst_tmp, *src_tmp; NMDedupMultiIter ipconf_iter; const NMPlatformIP6Address *a; @@ -1091,20 +1091,20 @@ nm_ip6_config_intersect (NMIP6Config *dst, const NMIP6Config *src) g_return_if_fail (src); g_return_if_fail (dst); - priv_dst = NM_IP6_CONFIG_GET_PRIVATE (dst); - priv_src = NM_IP6_CONFIG_GET_PRIVATE (src); + dst_priv = NM_IP6_CONFIG_GET_PRIVATE (dst); + src_priv = NM_IP6_CONFIG_GET_PRIVATE (src); g_object_freeze_notify (G_OBJECT (dst)); /* addresses */ changed = FALSE; nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, dst, &a) { - if (nm_dedup_multi_index_lookup_obj (priv_src->multi_idx, - &priv_src->idx_ip6_addresses, + if (nm_dedup_multi_index_lookup_obj (src_priv->multi_idx, + &src_priv->idx_ip6_addresses, NMP_OBJECT_UP_CAST (a))) continue; - if (nm_dedup_multi_index_remove_entry (priv_dst->multi_idx, + if (nm_dedup_multi_index_remove_entry (dst_priv->multi_idx, ipconf_iter.current) != 1) nm_assert_not_reached (); changed = TRUE; @@ -1128,12 +1128,12 @@ nm_ip6_config_intersect (NMIP6Config *dst, const NMIP6Config *src) /* routes */ changed = FALSE; nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, dst, &r) { - if (nm_dedup_multi_index_lookup_obj (priv_src->multi_idx, - &priv_src->idx_ip6_routes, + if (nm_dedup_multi_index_lookup_obj (src_priv->multi_idx, + &src_priv->idx_ip6_routes, NMP_OBJECT_UP_CAST (r))) continue; - if (nm_dedup_multi_index_remove_entry (priv_dst->multi_idx, + if (nm_dedup_multi_index_remove_entry (dst_priv->multi_idx, ipconf_iter.current) != 1) nm_assert_not_reached (); changed = TRUE; @@ -1143,7 +1143,7 @@ nm_ip6_config_intersect (NMIP6Config *dst, const NMIP6Config *src) /* ignore domains */ /* ignore dns searches */ - /* ignome dns options */ + /* ignore dns options */ g_object_thaw_notify (G_OBJECT (dst)); } |