Mercurial > hg > xemacs-beta
changeset 1497:0ad2242c43a4
[xemacs-hg @ 2003-05-22 10:18:55 by stephent]
fix compiler warning <87brxvs2v8.fsf@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Thu, 22 May 2003 10:18:58 +0000 |
| parents | e7b471ce22c1 |
| children | e10ef88fbbe6 |
| files | src/ChangeLog src/regex.c |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu May 22 09:57:57 2003 +0000 +++ b/src/ChangeLog Thu May 22 10:18:58 2003 +0000 @@ -1,3 +1,7 @@ +2003-05-20 Jerry James <james@xemacs.org> + + * regex.c (re_match_2_internal): pos -> charpos to fix shadow warning. + 2003-05-22 Stephen J. Turnbull <stephen@xemacs.org> * file-coding.c: DEFSYMBOL Qslightly_unlikely.
--- a/src/regex.c Thu May 22 09:57:57 2003 +0000 +++ b/src/regex.c Thu May 22 10:18:58 2003 +0000 @@ -6075,7 +6075,7 @@ /* XEmacs change */ /* Straightforward and (I hope) correct implementation. Probably should be optimized by arranging to compute - pos only once. */ + charpos only once. */ /* emch1 is the character before d, syn1 is the syntax of emch1, emch2 is the character at d, and syn2 is the syntax of emch2. */ @@ -6087,7 +6087,7 @@ at_beg = AT_STRINGS_BEG (d), at_end = AT_STRINGS_END (d); #ifdef emacs - Charxpos pos; + Charxpos charpos; #endif if (at_beg && at_end) @@ -6102,9 +6102,10 @@ DEC_IBYTEPTR_FMT (d_before, fmt); emch1 = itext_ichar_fmt (d_before, fmt, lispobj); #ifdef emacs - pos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)) - 1; + charpos = offset_to_charxpos (lispobj, + PTR_TO_OFFSET (d)) - 1; BEGIN_REGEX_MALLOC_OK (); - UPDATE_SYNTAX_CACHE (scache, pos); + UPDATE_SYNTAX_CACHE (scache, charpos); #endif syn1 = SYNTAX_FROM_CACHE (scache, emch1); END_REGEX_MALLOC_OK (); @@ -6114,9 +6115,9 @@ d_after = POS_AFTER_GAP_UNSAFE (d); emch2 = itext_ichar_fmt (d_after, fmt, lispobj); #ifdef emacs - pos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); + charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)); BEGIN_REGEX_MALLOC_OK (); - UPDATE_SYNTAX_CACHE_FORWARD (scache, pos); + UPDATE_SYNTAX_CACHE_FORWARD (scache, charpos); #endif syn2 = SYNTAX_FROM_CACHE (scache, emch2); END_REGEX_MALLOC_OK ();