diff options
| author | Paul Eggert | 2021-07-11 01:12:00 -0700 |
|---|---|---|
| committer | Paul Eggert | 2021-07-11 01:30:12 -0700 |
| commit | 3b29afa68070f3040f08fec0077213f9a15d1adc (patch) | |
| tree | 145917aa56335ad4ced9886537765d8557903729 /src/image.c | |
| parent | f6472cc8e2fdcfd7365240783f34e101fe44142b (diff) | |
| download | emacs-3b29afa68070f3040f08fec0077213f9a15d1adc.tar.gz emacs-3b29afa68070f3040f08fec0077213f9a15d1adc.zip | |
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.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c index 07de4d31aa8..e2f3220dd26 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -4991,7 +4991,7 @@ xpm_load_image (struct frame *f, | |||
| 4991 | 4991 | ||
| 4992 | while (num_colors-- > 0) | 4992 | while (num_colors-- > 0) |
| 4993 | { | 4993 | { |
| 4994 | char *color, *max_color; | 4994 | char *color, *max_color = NULL; |
| 4995 | int key, next_key, max_key = 0; | 4995 | int key, next_key, max_key = 0; |
| 4996 | Lisp_Object symbol_color = Qnil, color_val; | 4996 | Lisp_Object symbol_color = Qnil, color_val; |
| 4997 | Emacs_Color cdef; | 4997 | Emacs_Color cdef; |
| @@ -5052,7 +5052,7 @@ xpm_load_image (struct frame *f, | |||
| 5052 | cdef.blue)); | 5052 | cdef.blue)); |
| 5053 | } | 5053 | } |
| 5054 | } | 5054 | } |
| 5055 | if (NILP (color_val) && max_key > 0) | 5055 | if (NILP (color_val) && max_color) |
| 5056 | { | 5056 | { |
| 5057 | if (xstrcasecmp (max_color, "None") == 0) | 5057 | if (xstrcasecmp (max_color, "None") == 0) |
| 5058 | color_val = Qt; | 5058 | color_val = Qt; |