[Emacs-diffs] Changes to emacs/src/regex.c

[Eli Zaretskii]

Index: emacs/src/regex.c
diff -c emacs/src/regex.c:1.199 emacs/src/regex.c:1.200
*** emacs/src/regex.c:1.199     Mon Dec 20 11:06:14 2004
--- emacs/src/regex.c   Sun Apr 24 16:40:43 2005
***************
*** 4290,4301 ****
                        d += buf_charlen;
                      }
                  else
!                   while (range > lim
!                          && !fastmap[RE_TRANSLATE (translate, *d)])
!                     {
!                       d++;
!                       range--;
!                     }
                }
              else
                while (range > lim && !fastmap[*d])
--- 4290,4308 ----
                        d += buf_charlen;
                      }
                  else
!                   {
!                     /* Convert *d to integer to shut up GCC's
!                        whining about comparison that is always
!                        true.  */
!                     int di = *d;
! 
!                     while (range > lim
!                            && !fastmap[RE_TRANSLATE (translate, di)])
!                       {
!                         di = *(++d);
!                         range--;
!                       }
!                   }
                }
              else
                while (range > lim && !fastmap[*d])
***************
*** 5244,5251 ****
              else
                do
                  {
                    PREFETCH ();
!                   if (RE_TRANSLATE (translate, *d) != *p++)
                      {
                        d = dfail;
                        goto fail;
--- 5251,5263 ----
              else
                do
                  {
+                   /* Avoid compiler whining about comparison being
+                      always true.  */
+                   int di;
+ 
                    PREFETCH ();
!                   di = *d;
!                   if (RE_TRANSLATE (translate, di) != *p++)
                      {
                        d = dfail;
                        goto fail;