fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 14:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: simplify nm_ip[46]_config_diff() result check

Browse source 
nm_ip[46]_config_diff() explicitly checks for NULL arguments.
This commit is contained in:
Pavel Šimerda 2013-07-02 22:45:25 +02:00
parent 3e534c0e65
commit 253906ecd2
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/nm-device.c
View file

@ -4279,7 +4279,6 @@ nm_device_set_ip4_config (NMDevice *self,
const char *ip_iface; const char *ip_iface;
NMIP4Config *old_config = NULL; NMIP4Config *old_config = NULL;
gboolean success = TRUE; gboolean success = TRUE;
NMIP4ConfigCompareFlags diff = NM_IP4_COMPARE_FLAG_ALL;
int ip_ifindex; int ip_ifindex;
g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
@ -4291,12 +4290,8 @@ nm_device_set_ip4_config (NMDevice *self,
old_config = priv->ip4_config; old_config = priv->ip4_config;
if (new_config && old_config) { if (!nm_ip4_config_diff (new_config, old_config))
diff = nm_ip4_config_diff (new_config, old_config); return success;
if (diff == NM_IP4_COMPARE_FLAG_NONE)
return TRUE; /* no actual change */
} else if (!new_config && !old_config)
return TRUE;
priv->ip4_config = NULL; priv->ip4_config = NULL;
@ -4336,7 +4331,6 @@ nm_device_set_ip6_config (NMDevice *self,
const char *ip_iface; const char *ip_iface;
NMIP6Config *old_config = NULL; NMIP6Config *old_config = NULL;
gboolean success = TRUE; gboolean success = TRUE;
NMIP6ConfigCompareFlags diff = NM_IP6_COMPARE_FLAG_ALL;
int ip_ifindex; int ip_ifindex;
g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
@ -4348,12 +4342,8 @@ nm_device_set_ip6_config (NMDevice *self,
old_config = priv->ip6_config; old_config = priv->ip6_config;
if (new_config && old_config) { if (!nm_ip6_config_diff (new_config, old_config));
diff = nm_ip6_config_diff (new_config, old_config); return success;
if (diff == NM_IP6_COMPARE_FLAG_NONE)
return TRUE; /* no actual change */
} else if (!new_config && !old_config)
return TRUE;
priv->ip6_config = NULL; priv->ip6_config = NULL;