Commit 3b29afa6 authored by Paul Eggert's avatar Paul Eggert
Browse files

Pacify GCC 11.1.1 20210531 (Red Hat 11.1.1-3)

* src/image.c (xpm_load_image):
* src/xfns.c (x_icon):
Rework to pacify gcc -Wmaybe-uninitialized.
parent f6472cc8
Pipeline #11366 failed with stages
in 1 minute and 18 seconds
......@@ -4991,7 +4991,7 @@ xpm_load_image (struct frame *f,
while (num_colors-- > 0)
{
char *color, *max_color;
char *color, *max_color = NULL;
int key, next_key, max_key = 0;
Lisp_Object symbol_color = Qnil, color_val;
Emacs_Color cdef;
......@@ -5052,7 +5052,7 @@ xpm_load_image (struct frame *f,
cdef.blue));
}
}
if (NILP (color_val) && max_key > 0)
if (NILP (color_val) && max_color)
{
if (xstrcasecmp (max_color, "None") == 0)
color_val = Qt;
......
......@@ -3361,17 +3361,19 @@ x_icon (struct frame *f, Lisp_Object parms)
= gui_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
int icon_xval, icon_yval;
if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
bool xgiven = !EQ (icon_x, Qunbound);
bool ygiven = !EQ (icon_y, Qunbound);
if (xgiven != ygiven)
error ("Both left and top icon corners of icon must be specified");
if (xgiven)
{
icon_xval = check_integer_range (icon_x, INT_MIN, INT_MAX);
icon_yval = check_integer_range (icon_y, INT_MIN, INT_MAX);
}
else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
error ("Both left and top icon corners of icon must be specified");
block_input ();
if (! EQ (icon_x, Qunbound))
if (xgiven)
x_wm_set_icon_position (f, icon_xval, icon_yval);
#if false /* gui_display_get_arg removes the visibility parameter as a
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment