procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pacify gcc 10.2 -Wanalyzer-null-argument in gtkutil.c

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2020-12-25 00:27:37 -08:00
parent 290ee3474d
commit b8b17038e1
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gtkutil.c
View file

@ -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);