mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-31 04:41:23 -08:00
Code Issues Projects Releases Wiki Activity

Fix int/EMACS_INT use in lread.c, marker.c, minibuf.c, print.c

Browse source 
print.c (print_object, print_string, strout): Use EMACS_INT for
 string indices.
 minibuf.c (string_to_object): Use EMACS_INT for string position
 and size.
 marker.c (verify_bytepos): Use EMACS_INT for buffer positions.
 lread.c <read_from_string_index, read_from_string_index_byte>
 <read_from_string_limit, readchar_count>: Define EMACS_INT.
 (readchar, unreadchar, read_internal_start): Use EMACS_INT for
 buffer positions and string length.
This commit is contained in:
Eli Zaretskii 2010-09-25 07:55:30 -04:00
parent 41118bd30d
commit da43f02119
5 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ChangeLog
View file

@ -1,5 +1,18 @@
2010-09-25 Eli Zaretskii <eliz@gnu.org>
* print.c (print_object, print_string, strout): Use EMACS_INT for
string indices.
* minibuf.c (string_to_object): Use EMACS_INT for string position
and size.
* marker.c (verify_bytepos): Use EMACS_INT for buffer positions.
* lread.c <read_from_string_index, read_from_string_index_byte>
<read_from_string_limit, readchar_count>: Define EMACS_INT.
(readchar, unreadchar, read_internal_start): Use EMACS_INT for
buffer positions and string length.
* keyboard.c <last_point_position, last_non_minibuf_size>: Declare
EMACS_INT.
(echo_truncate, adjust_point_for_property, read_char)

18
src/lread.c
View file

@ -163,13 +163,13 @@ static FILE *instream;
static int read_pure;
/* For use within read-from-string (this reader is non-reentrant!!) */
static int read_from_string_index;
static int read_from_string_index_byte;
static int read_from_string_limit;
static EMACS_INT read_from_string_index;
static EMACS_INT read_from_string_index_byte;
static EMACS_INT read_from_string_limit;
/* Number of characters read in the current call to Fread or
Fread_from_string. */
static int readchar_count;
static EMACS_INT readchar_count;
/* This contains the last string skipped with #@. */
static char *saved_doc_string;
@ -276,7 +276,7 @@ readchar (Lisp_Object readcharfun, int *multibyte)
{
register struct buffer *inbuffer = XBUFFER (readcharfun);
int pt_byte = BUF_PT_BYTE (inbuffer);
EMACS_INT pt_byte = BUF_PT_BYTE (inbuffer);
if (pt_byte >= BUF_ZV_BYTE (inbuffer))
return -1;
@ -305,7 +305,7 @@ readchar (Lisp_Object readcharfun, int *multibyte)
{
register struct buffer *inbuffer = XMARKER (readcharfun)->buffer;
int bytepos = marker_byte_position (readcharfun);
EMACS_INT bytepos = marker_byte_position (readcharfun);
if (bytepos >= BUF_ZV_BYTE (inbuffer))
return -1;
@ -439,7 +439,7 @@ unreadchar (Lisp_Object readcharfun, int c)
else if (BUFFERP (readcharfun))
{
struct buffer *b = XBUFFER (readcharfun);
int bytepos = BUF_PT_BYTE (b);
EMACS_INT bytepos = BUF_PT_BYTE (b);
BUF_PT (b)--;
if (! NILP (b->enable_multibyte_characters))
@ -452,7 +452,7 @@ unreadchar (Lisp_Object readcharfun, int c)
else if (MARKERP (readcharfun))
{
struct buffer *b = XMARKER (readcharfun)->buffer;
int bytepos = XMARKER (readcharfun)->bytepos;
EMACS_INT bytepos = XMARKER (readcharfun)->bytepos;
XMARKER (readcharfun)->charpos--;
if (! NILP (b->enable_multibyte_characters))
@ -1893,7 +1893,7 @@ read_internal_start (Lisp_Object stream, Lisp_Object start, Lisp_Object end)
if (STRINGP (stream)
|| ((CONSP (stream) && STRINGP (XCAR (stream)))))
{
int startval, endval;
EMACS_INT startval, endval;
Lisp_Object string;
if (STRINGP (stream))

8
src/marker.c
View file

@ -247,11 +247,11 @@ buf_charpos_to_bytepos (struct buffer *b, EMACS_INT charpos)
/* Used for debugging: recompute the bytepos corresponding to CHARPOS
in the simplest, most reliable way. */
int
verify_bytepos (int charpos)
EMACS_INT
verify_bytepos (EMACS_INT charpos)
{
int below = 1;
int below_byte = 1;
EMACS_INT below = 1;
EMACS_INT below_byte = 1;
while (below != charpos)
{

4
src/minibuf.c
View file

@ -236,7 +236,7 @@ string_to_object (Lisp_Object val, Lisp_Object defalt)
{
struct gcpro gcpro1, gcpro2;
Lisp_Object expr_and_pos;
int pos;
EMACS_INT pos;
GCPRO2 (val, defalt);
@ -254,7 +254,7 @@ string_to_object (Lisp_Object val, Lisp_Object defalt)
{
/* Ignore trailing whitespace; any other trailing junk
is an error. */
int i;
EMACS_INT i;
pos = string_char_to_byte (val, pos);
for (i = pos; i < SBYTES (val); i++)
{

6
src/print.c
View file

@ -395,7 +395,7 @@ strout (const char *ptr, EMACS_INT size, EMACS_INT size_byte,
else
{
/* PRINTCHARFUN is a Lisp function. */
int i = 0;
EMACS_INT i = 0;
if (size == size_byte)
{
@ -489,7 +489,7 @@ print_string (Lisp_Object string, Lisp_Object printcharfun)
{
/* Otherwise, string may be relocated by printing one char.
So re-fetch the string address for each character. */
int i;
EMACS_INT i;
EMACS_INT size = SCHARS (string);
EMACS_INT size_byte = SBYTES (string);
struct gcpro gcpro1;
@ -1563,7 +1563,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
print_string (obj, printcharfun);
else
{
register int i, i_byte;
register EMACS_INT i, i_byte;
struct gcpro gcpro1;
unsigned char *str;
EMACS_INT size_byte;