Re: Problem with r226035 - in head/usr.bin/grep: . regex?

On 10/05/11 09:50, David Wolfskill wrote:
> I noted the following after updating head to r226035:
> ...
>>>> stage 4.4: building everything
> ...
> cc -O2 -pipe  -Dxregcomp=regcomp -Dxre_exec=re_exec -Dxregexec=regexec -Dxre_search=re_search -Dxre_compile_fastmap=re_compile_fastmap -Dxregerror=regerror -Dxre_comp=re_comp -Dxre_set_syntax=re_set_syntax -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1 -I. -I/usr/src/gnu/usr.bin/gdb/libgdb/../arch/i386 -I/usr/src/gnu/usr.bin/gdb/libgdb/../../binutils/libbfd -I/usr/src/gnu/usr.bin/gdb/libgdb/../../binutils/libbfd/i386 -I/usr/src/gnu/usr.bin/gdb/libgdb/../../../../contrib/gdb/gdb -I/usr/src/gnu/usr.bin/gdb/libgdb/../../../../contrib/gdb/gdb/config -I/usr/src/gnu/usr.bin/gdb/libgdb/../../../../contrib/binutils/include -I/usr/src/gnu/usr.bin/gdb/libgdb/../../../../contrib/gdb/include -I/usr/src/gnu/usr.bin/gdb/libgdb/../../../../contrib/binutils/bfd -std=gnu99 -fstack-protector  -c /usr/src/gnu/usr.bin/gdb/libgdb/../../../../contrib/gdb/gdb/tui/tui-source.c
> cc1: warnings being treated as errors
> /usr/src/usr.bin/grep/regex/tre-fastmatch.c: In function 'tre_match_fast':
> /usr/src/usr.bin/grep/regex/tre-fastmatch.c:961: warning: comparison of unsigned expression<  0 is always false
> *** Error code 1
> 1 error
> *** Error code 2
>
> [I'm sorry, but I won't be in position to test fixes until after my
> laptop comes back from repair.]

Does this look right?

*** src/usr.bin/grep/regex/tre-fastmatch.c~     Wed Oct  5 07:25:39 2011
--- src/usr.bin/grep/regex/tre-fastmatch.c      Wed Oct  5 09:02:39 2011
***************
*** 163,169 ****
         shift = bc;                                                     \
       else                                                              \
         { 
          \
!       ts = ((long)u - v < 0) ? 0 : (u - v);                           \
         shift = MAX(ts, bc);                                            \
         shift = MAX(shift, gs);                                         \
         if (shift == gs)                                                \
--- 163,169 ----
         shift = bc;                                                     \
       else                                                              \
         { 
          \
!       ts = ((long)u - (long)v < 0) ? 0 : (u - v); 
         \
         shift = MAX(ts, bc);                                            \
         shift = MAX(shift, gs);                                         \
         if (shift == gs)                                                \