From b8b17038e140fe215a76f2e899c00b9b95614886 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 25 Dec 2020 00:27:37 -0800 Subject: [PATCH] Pacify gcc 10.2 -Wanalyzer-null-argument in gtkutil.c * src/gtkutil.c (xg_item_label_same_p): Simplify. Without this simplification, GCC (Ubuntu 10.2.0-13ubuntu1) -Wanalyzer-null-argument complains about use of NULL where non-null expected as argument of strcmp. --- src/gtkutil.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gtkutil.c b/src/gtkutil.c index fafd94c0f71..807ee17fa30 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2944,14 +2944,11 @@ xg_get_menu_item_label (GtkMenuItem *witem) static bool xg_item_label_same_p (GtkMenuItem *witem, const char *label) { - bool is_same = 0; char *utf8_label = get_utf8_string (label); const char *old_label = witem ? xg_get_menu_item_label (witem) : 0; - if (! old_label && ! utf8_label) - is_same = 1; - else if (old_label && utf8_label) - is_same = strcmp (utf8_label, old_label) == 0; + bool is_same = (!old_label == !utf8_label + && (!old_label || strcmp (utf8_label, old_label) == 0)); if (utf8_label) g_free (utf8_label); -- 2.39.5