Change 29532 by [EMAIL PROTECTED] on 2006/12/12 17:49:51
Silence VC warnings about possible operator precedence problems
and signed/unsigned mismatches
Affected files ...
... //depot/perl/regexec.c#502 edit
... //depot/perl/sv.h#297 edit
... //depot/perl/util.c#599 edit
Differences ...
==== //depot/perl/regexec.c#502 (text) ====
Index: perl/regexec.c
--- perl/regexec.c#501~29503~ 2006-12-10 15:05:25.000000000 -0800
+++ perl/regexec.c 2006-12-12 09:49:51.000000000 -0800
@@ -514,7 +514,7 @@
if (PL_screamfirst[BmRARE(check)] >= 0
|| ( BmRARE(check) == '\n'
- && (BmPREVIOUS(check) == SvCUR(check) - 1)
+ && (BmPREVIOUS(check) == (U8)SvCUR(check) - 1)
&& SvTAIL(check) ))
s = screaminstr(sv, check,
srch_start_shift + (s - strbeg), srch_end_shift,
pp, 0);
==== //depot/perl/sv.h#297 (text) ====
Index: perl/sv.h
--- perl/sv.h#296~29527~ 2006-12-11 16:07:48.000000000 -0800
+++ perl/sv.h 2006-12-12 09:49:51.000000000 -0800
@@ -1353,10 +1353,10 @@
# define BmUSEFUL(sv) ((XPVBM*) SvANY(sv))->xiv_u.xivu_i32
# define BmPREVIOUS(sv) \
- (*(U8*)(SvEND(sv) + PERL_FBM_TABLE_OFFSET \
+ ((*(U8*)(SvEND(sv) + PERL_FBM_TABLE_OFFSET \
+ PERL_FBM_PREVIOUS_H_OFFSET_FROM_TABLE) << 8) \
- | (*(U8*)(SvEND(sv) + PERL_FBM_TABLE_OFFSET
\
- + PERL_FBM_PREVIOUS_L_OFFSET_FROM_TABLE)) \
+ | (*(U8*)(SvEND(sv) + PERL_FBM_TABLE_OFFSET \
+ + PERL_FBM_PREVIOUS_L_OFFSET_FROM_TABLE))) \
#endif
#define BmPREVIOUS_set(sv, val)
\
==== //depot/perl/util.c#599 (text) ====
Index: perl/util.c
--- perl/util.c#598~29526~ 2006-12-11 15:44:30.000000000 -0800
+++ perl/util.c 2006-12-12 09:49:51.000000000 -0800
@@ -767,7 +767,7 @@
: (((pos = *old_posp), pos += PL_screamnext[pos]) == 0)) {
cant_find:
if ( BmRARE(littlestr) == '\n'
- && BmPREVIOUS(littlestr) == SvCUR(littlestr) - 1) {
+ && BmPREVIOUS(littlestr) == (U8)SvCUR(littlestr) - 1) {
little = (const unsigned char *)(SvPVX_const(littlestr));
littleend = little + SvCUR(littlestr);
first = *little++;
End of Patch.
