summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-10-04 09:38:58 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-10-06 10:03:48 +0200
commit848ba369fa0cd4638d48e7ff500dd8518ffb1c49 (patch)
tree5c65ef086a5722bd329356037d32035aeaeb34d0
parentdf48bd6f4d9c8c2ce881a470ab4ffda7233d72b2 (diff)
libnm-core: remove unneeded comparisons
a_gendata and b_gendata cannot be NULL. This makes coverity happy.
-rw-r--r--libnm-core/nm-setting.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index a8f7668ae..e5e9ab965 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -1422,7 +1422,7 @@ nm_setting_diff (NMSetting *a,
} else {
g_hash_table_iter_init (&iter, a_gendata->hash);
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
- val2 = b_gendata ? g_hash_table_lookup (b_gendata->hash, key) : NULL;
+ val2 = g_hash_table_lookup (b_gendata->hash, key);
compared_any = TRUE;
if ( !val2
|| !g_variant_equal (val, val2)) {
@@ -1432,7 +1432,7 @@ nm_setting_diff (NMSetting *a,
}
g_hash_table_iter_init (&iter, b_gendata->hash);
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
- val2 = a_gendata ? g_hash_table_lookup (a_gendata->hash, key) : NULL;
+ val2 = g_hash_table_lookup (a_gendata->hash, key);
compared_any = TRUE;
if ( !val2
|| !g_variant_equal (val, val2)) {