From 2ffcdb8efa1a89d8893aa40909c78491d0ed1ba4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 19 Sep 2018 14:24:36 +0200 Subject: [PATCH] settings/ifupdown/tests: avoid asserting on an array char[] is not a char *; it can not go NULL. test-ifupdown.c:147:27: error: address of array 'n->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] g_assert (b->name && n->name); test-ifupdown.c:156:27: error: address of array 'm->key' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] g_assert (k->key && m->key); (cherry picked from commit b64ae759ad3eb14aecc79e50c0a2090f29288323) --- src/settings/plugins/ifupdown/tests/test-ifupdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index e96350c0fb..82ee1c4acc 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -144,7 +144,7 @@ compare_expected_to_ifparser (if_parser *parser, Expected *e) g_assert (b->type && n->type); g_assert_cmpstr (b->type, ==, n->type); - g_assert (b->name && n->name); + g_assert (b->name); g_assert_cmpstr (b->name, ==, n->name); g_assert_cmpint (g_slist_length (b->keys), ==, ifparser_get_num_info (n)); @@ -153,7 +153,7 @@ compare_expected_to_ifparser (if_parser *parser, Expected *e) c_list_for_each_entry (m, &n->data_lst_head, data_lst) { ExpectedKey *k = kiter->data; - g_assert (k->key && m->key); + g_assert (k->key); g_assert_cmpstr (k->key, ==, m->key); g_assert (k->data && m->data); g_assert_cmpstr (k->data, ==, m->data);