From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 6 Apr 2020 17:36:51 +0000 (-0700)
Subject: Pacify gcc in xpm_scan
X-Git-Tag: emacs-28.0.90~7635
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b04047653865c8d09cea8c852f7b29f33adb907;p=emacs.git

Pacify gcc in xpm_scan

* src/image.c (xpm_scan): Redo a loop for clarity.
This also pacifies --enable-gcc-warnings (GCC 9.3.1 x86-64 with -Og).
---

diff --git a/src/image.c b/src/image.c
index 65d59254f02..c98ca291ca5 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4572,8 +4572,9 @@ xpm_scan (const char **s, const char *end, const char **beg, ptrdiff_t *len)
   while (*s < end)
     {
       /* Skip white-space.  */
-      while (*s < end && (c = *(*s)++, c_isspace (c)))
-	;
+      do
+	c = *(*s)++;
+      while (c_isspace (c) && *s < end);
 
       /* gnus-pointer.xpm uses '-' in its identifier.
 	 sb-dir-plus.xpm uses '+' in its identifier.  */