aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-18 17:12:53 -0700
committerPaul Eggert2011-03-18 17:12:53 -0700
commit760fbc2c7d8c1f3e8b38583c28d655f11f9bc0e2 (patch)
tree71048bb90e2f7638f9875481ee37d3883df72dd0 /src
parentff08eb8560405630be43c0543aa5558ed0fe6cbf (diff)
downloademacs-760fbc2c7d8c1f3e8b38583c28d655f11f9bc0e2.tar.gz
emacs-760fbc2c7d8c1f3e8b38583c28d655f11f9bc0e2.zip
character.h: Rename locals to avoid shadowing.
* character.h (PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE): (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE, FETCH_CHAR_ADVANCE): (FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, BUF_INC_POS): (BUF_DEC_POS): Be more systematic about renaming local temporaries to avoid shadowing.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/character.h68
2 files changed, 41 insertions, 34 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 65b7bccd79e..b614091bdbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
12011-03-18 Paul Eggert <eggert@cs.ucla.edu> 12011-03-18 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 character.h: Rename locals to avoid shadowing.
4 * character.h (PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE):
5 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE, FETCH_CHAR_ADVANCE):
6 (FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, BUF_INC_POS):
7 (BUF_DEC_POS): Be more systematic about renaming local temporaries
8 to avoid shadowing.
9
3 * textprop.c (property_change_between_p): Remove; unused. 10 * textprop.c (property_change_between_p): Remove; unused.
4 11
5 * intervals.c (interval_start_pos): Now static. 12 * intervals.c (interval_start_pos): Now static.
diff --git a/src/character.h b/src/character.h
index 4c468e14d2c..91020cadedc 100644
--- a/src/character.h
+++ b/src/character.h
@@ -278,11 +278,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
278 do { \ 278 do { \
279 if ((p) > (limit)) \ 279 if ((p) > (limit)) \
280 { \ 280 { \
281 const unsigned char *pcb = (p); \ 281 const unsigned char *chp = (p); \
282 do { \ 282 do { \
283 pcb--; \ 283 chp--; \
284 } while (pcb >= limit && ! CHAR_HEAD_P (*pcb)); \ 284 } while (chp >= limit && ! CHAR_HEAD_P (*chp)); \
285 (p) = (BYTES_BY_CHAR_HEAD (*pcb) == (p) - pcb) ? pcb : (p) - 1; \ 285 (p) = (BYTES_BY_CHAR_HEAD (*chp) == (p) - chp) ? chp : (p) - 1; \
286 } \ 286 } \
287 } while (0) 287 } while (0)
288 288
@@ -353,11 +353,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
353 CHARIDX++; \ 353 CHARIDX++; \
354 if (STRING_MULTIBYTE (STRING)) \ 354 if (STRING_MULTIBYTE (STRING)) \
355 { \ 355 { \
356 unsigned char *string_ptr = &SDATA (STRING)[BYTEIDX]; \ 356 unsigned char *chp = &SDATA (STRING)[BYTEIDX]; \
357 int string_len; \ 357 int chlen; \
358 \ 358 \
359 OUTPUT = STRING_CHAR_AND_LENGTH (string_ptr, string_len); \ 359 OUTPUT = STRING_CHAR_AND_LENGTH (chp, chlen); \
360 BYTEIDX += string_len; \ 360 BYTEIDX += chlen; \
361 } \ 361 } \
362 else \ 362 else \
363 { \ 363 { \
@@ -376,11 +376,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
376 CHARIDX++; \ 376 CHARIDX++; \
377 if (STRING_MULTIBYTE (STRING)) \ 377 if (STRING_MULTIBYTE (STRING)) \
378 { \ 378 { \
379 unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ 379 unsigned char *chp = &SDATA (STRING)[BYTEIDX]; \
380 int ptrlen; \ 380 int chlen; \
381 \ 381 \
382 OUTPUT = STRING_CHAR_AND_LENGTH (ptr, ptrlen); \ 382 OUTPUT = STRING_CHAR_AND_LENGTH (chp, chlen); \
383 BYTEIDX += ptrlen; \ 383 BYTEIDX += chlen; \
384 } \ 384 } \
385 else \ 385 else \
386 { \ 386 { \
@@ -416,11 +416,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
416 CHARIDX++; \ 416 CHARIDX++; \
417 if (!NILP (BVAR (current_buffer, enable_multibyte_characters))) \ 417 if (!NILP (BVAR (current_buffer, enable_multibyte_characters))) \
418 { \ 418 { \
419 unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \ 419 unsigned char *chp = BYTE_POS_ADDR (BYTEIDX); \
420 int string_len; \ 420 int chlen; \
421 \ 421 \
422 OUTPUT= STRING_CHAR_AND_LENGTH (ptr, string_len); \ 422 OUTPUT= STRING_CHAR_AND_LENGTH (chp, chlen); \
423 BYTEIDX += string_len; \ 423 BYTEIDX += chlen; \
424 } \ 424 } \
425 else \ 425 else \
426 { \ 426 { \
@@ -436,11 +436,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
436#define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX) \ 436#define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX) \
437 do \ 437 do \
438 { \ 438 { \
439 unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \ 439 unsigned char *chp = BYTE_POS_ADDR (BYTEIDX); \
440 int len; \ 440 int chlen; \
441 \ 441 \
442 OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ 442 OUTPUT = STRING_CHAR_AND_LENGTH (chp, chlen); \
443 BYTEIDX += len; \ 443 BYTEIDX += chlen; \
444 CHARIDX++; \ 444 CHARIDX++; \
445 } \ 445 } \
446 while (0) 446 while (0)
@@ -451,8 +451,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
451 451
452#define INC_POS(pos_byte) \ 452#define INC_POS(pos_byte) \
453 do { \ 453 do { \
454 unsigned char *ptr = BYTE_POS_ADDR (pos_byte); \ 454 unsigned char *chp = BYTE_POS_ADDR (pos_byte); \
455 pos_byte += BYTES_BY_CHAR_HEAD (*ptr); \ 455 pos_byte += BYTES_BY_CHAR_HEAD (*chp); \
456 } while (0) 456 } while (0)
457 457
458 458
@@ -461,16 +461,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
461 461
462#define DEC_POS(pos_byte) \ 462#define DEC_POS(pos_byte) \
463 do { \ 463 do { \
464 unsigned char *ptr; \ 464 unsigned char *chp; \
465 \ 465 \
466 pos_byte--; \ 466 pos_byte--; \
467 if (pos_byte < GPT_BYTE) \ 467 if (pos_byte < GPT_BYTE) \
468 ptr = BEG_ADDR + pos_byte - BEG_BYTE; \ 468 chp = BEG_ADDR + pos_byte - BEG_BYTE; \
469 else \ 469 else \
470 ptr = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE; \ 470 chp = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE; \
471 while (!CHAR_HEAD_P (*ptr)) \ 471 while (!CHAR_HEAD_P (*chp)) \
472 { \ 472 { \
473 ptr--; \ 473 chp--; \
474 pos_byte--; \ 474 pos_byte--; \
475 } \ 475 } \
476 } while (0) 476 } while (0)
@@ -510,8 +510,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
510 510
511#define BUF_INC_POS(buf, pos_byte) \ 511#define BUF_INC_POS(buf, pos_byte) \
512 do { \ 512 do { \
513 unsigned char *bbp = BUF_BYTE_ADDRESS (buf, pos_byte); \ 513 unsigned char *chp = BUF_BYTE_ADDRESS (buf, pos_byte); \
514 pos_byte += BYTES_BY_CHAR_HEAD (*bbp); \ 514 pos_byte += BYTES_BY_CHAR_HEAD (*chp); \
515 } while (0) 515 } while (0)
516 516
517 517
@@ -520,15 +520,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
520 520
521#define BUF_DEC_POS(buf, pos_byte) \ 521#define BUF_DEC_POS(buf, pos_byte) \
522 do { \ 522 do { \
523 unsigned char *p; \ 523 unsigned char *chp; \
524 pos_byte--; \ 524 pos_byte--; \
525 if (pos_byte < BUF_GPT_BYTE (buf)) \ 525 if (pos_byte < BUF_GPT_BYTE (buf)) \
526 p = BUF_BEG_ADDR (buf) + pos_byte - BEG_BYTE; \ 526 chp = BUF_BEG_ADDR (buf) + pos_byte - BEG_BYTE; \
527 else \ 527 else \
528 p = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - BEG_BYTE;\ 528 chp = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - BEG_BYTE;\
529 while (!CHAR_HEAD_P (*p)) \ 529 while (!CHAR_HEAD_P (*chp)) \
530 { \ 530 { \
531 p--; \ 531 chp--; \
532 pos_byte--; \ 532 pos_byte--; \
533 } \ 533 } \
534 } while (0) 534 } while (0)
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-20 13:14:38 +0000