diff options
| author | Paul Eggert <[email protected]> | 2011-06-21 14:32:10 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-06-21 14:32:10 -0700 |
| commit | b081724f64cbb2bf1f12efdb4d446c1de9bf3c0c (patch) | |
| tree | 00f145722fcbfb737a464ee83fbae70be8d6a4b4 /src/buffer.h | |
| parent | 3de73e5ee550ff9715e3c6034b2575a4386cf331 (diff) | |
Use ptrdiff_t, not int, for overlay counts.
* buffer.h (overlays_at, sort_overlays, GET_OVERLAYS_AT):
* editfns.c (overlays_around, get_pos_property):
* textprop.c (get_char_property_and_overlay):
* xdisp.c (next_overlay_change, note_mouse_highlight):
* xfaces.c (face_at_buffer_position):
* buffer.c (overlays_at, sort_overlays, Foverlays_at)
(Fnext_overlay_change, Fprevious_overlay_change):
Use ptrdiff_t, not int, for sizes.
(overlays_at): Check for size-calculation overflow.
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/buffer.h b/src/buffer.h index a13351b5ea..4643e0d9d0 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -887,10 +887,10 @@ extern struct buffer buffer_local_symbols; extern void delete_all_overlays (struct buffer *); extern void reset_buffer (struct buffer *); extern void evaporate_overlays (EMACS_INT); -extern int overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, - int *len_ptr, EMACS_INT *next_ptr, - EMACS_INT *prev_ptr, int change_req); -extern int sort_overlays (Lisp_Object *, int, struct window *); +extern ptrdiff_t overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, + ptrdiff_t *len_ptr, EMACS_INT *next_ptr, + EMACS_INT *prev_ptr, int change_req); +extern ptrdiff_t sort_overlays (Lisp_Object *, ptrdiff_t, struct window *); extern void recenter_overlay_lists (struct buffer *, EMACS_INT); extern EMACS_INT overlay_strings (EMACS_INT, struct window *, unsigned char **); extern void validate_region (Lisp_Object *, Lisp_Object *); @@ -908,7 +908,7 @@ extern void mmap_set_vars (int); #define GET_OVERLAYS_AT(posn, overlays, noverlays, nextp, chrq) \ do { \ - int maxlen = 40; \ + ptrdiff_t maxlen = 40; \ overlays = (Lisp_Object *) alloca (maxlen * sizeof (Lisp_Object)); \ noverlays = overlays_at (posn, 0, &overlays, &maxlen, \ nextp, NULL, chrq); \ |