From c1538496a902a18d599598815c171bed5bef1124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Thu, 4 Jul 2013 18:13:46 +0200 Subject: [PATCH] trivial: simplify nm_ip[46]_config_diff() NULL comparison logic --- src/nm-ip4-config.c | 4 ++-- src/nm-ip6-config.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 3208a16447..345a92cf6a 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -913,10 +913,10 @@ nm_ip4_config_diff (NMIP4Config *a, NMIP4Config *b) NMIP4ConfigPrivate *b_priv; NMIP4ConfigCompareFlags flags = NM_IP4_COMPARE_FLAG_NONE; - if ((a && !b) || (b && !a)) - return NM_IP4_COMPARE_FLAG_ALL; if (!a && !b) return NM_IP4_COMPARE_FLAG_NONE; + if (!a || !b) + return NM_IP4_COMPARE_FLAG_ALL; a_priv = NM_IP4_CONFIG_GET_PRIVATE (a); b_priv = NM_IP4_CONFIG_GET_PRIVATE (b); diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 453f7f134d..24b9f1f0c9 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -852,10 +852,10 @@ nm_ip6_config_diff (NMIP6Config *a, NMIP6Config *b) NMIP6ConfigPrivate *b_priv; NMIP6ConfigCompareFlags flags = NM_IP6_COMPARE_FLAG_NONE; - if ((a && !b) || (b && !a)) - return NM_IP6_COMPARE_FLAG_ALL; if (!a && !b) return NM_IP6_COMPARE_FLAG_NONE; + if (!a || !b) + return NM_IP6_COMPARE_FLAG_ALL; a_priv = NM_IP6_CONFIG_GET_PRIVATE (a); b_priv = NM_IP6_CONFIG_GET_PRIVATE (b);