From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Oct 2021 23:31:50 +0000 (-0700)
Subject: Pacify gcc 11.2.1 -Wanalyzer-null-argument
X-Git-Tag: emacs-28.0.90~432
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc3fc94f09332e5cca28fea1f19a93c8d45fd0f8;p=emacs.git

Pacify gcc 11.2.1 -Wanalyzer-null-argument

* src/gtkutil.c (xg_item_label_same_p): Clarify boolean expression
to pacify -Wanalyzer-null-argument with GCC 11.2.1 20210728
(Red Hat 11.2.1-1).
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 313cfc82c26..e87845caf70 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2932,8 +2932,9 @@ xg_item_label_same_p (GtkMenuItem *witem, const char *label)
   char *utf8_label = get_utf8_string (label);
   const char *old_label = witem ? xg_get_menu_item_label (witem) : 0;
 
-  bool is_same = (!old_label == !utf8_label
-		  && (!old_label || strcmp (utf8_label, old_label) == 0));
+  bool is_same = (old_label
+		  ? utf8_label && strcmp (utf8_label, old_label) == 0
+		  : !utf8_label);
 
   if (utf8_label) g_free (utf8_label);