mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

* region-cache.c (insert_cache_boundary): Redo var to avoid shadowing.

Browse source
This commit is contained in:
Paul Eggert 2011-03-17 23:25:25 -07:00
parent 918436ed33
commit c4fc4e301e
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2011-03-18 Paul Eggert <eggert@cs.ucla.edu>
* region-cache.c (insert_cache_boundary): Redo var to avoid shadowing.
* region-cache.h (pp_cache): New decl, for gcc -Wmissing-prototypes.
* callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.

25
src/region-cache.c
View file

@ -290,37 +290,37 @@ move_cache_gap (struct region_cache *c, EMACS_INT pos, EMACS_INT min_size)
}
/* Insert a new boundary in cache C; it will have cache index INDEX,
/* Insert a new boundary in cache C; it will have cache index I,
and have the specified POS and VALUE. */
static void
insert_cache_boundary (struct region_cache *c, EMACS_INT index, EMACS_INT pos,
insert_cache_boundary (struct region_cache *c, EMACS_INT i, EMACS_INT pos,
int value)
{
/* index must be a valid cache index. */
if (index < 0 || index > c->cache_len)
/* i must be a valid cache index. */
if (i < 0 || i > c->cache_len)
abort ();
/* We must never want to insert something before the dummy first
boundary. */
if (index == 0)
if (i == 0)
abort ();
/* We must only be inserting things in order. */
if (! (BOUNDARY_POS (c, index-1) < pos
&& (index == c->cache_len
|| pos < BOUNDARY_POS (c, index))))
if (! (BOUNDARY_POS (c, i - 1) < pos
&& (i == c->cache_len
|| pos < BOUNDARY_POS (c, i))))
abort ();
/* The value must be different from the ones around it. However, we
temporarily create boundaries that establish the same value as
the subsequent boundary, so we're not going to flag that case. */
if (BOUNDARY_VALUE (c, index-1) == value)
if (BOUNDARY_VALUE (c, i - 1) == value)
abort ();
move_cache_gap (c, index, 1);
move_cache_gap (c, i, 1);
c->boundaries[index].pos = pos - c->buffer_beg;
c->boundaries[index].value = value;
c->boundaries[i].pos = pos - c->buffer_beg;
c->boundaries[i].value = value;
c->gap_start++;
c->gap_len--;
c->cache_len++;
@ -808,4 +808,3 @@ pp_cache (struct region_cache *c)
fprintf (stderr, "%ld : %d\n", (long)pos, BOUNDARY_VALUE (c, i));
}
}