diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-09-25 07:55:30 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-09-25 07:55:30 -0400 |
| commit | da43f02119eb86ff8a4ee8ce7454b10d261ef714 (patch) | |
| tree | 8b42c4a38e55c29603b7bab7421d75ede479040f /src/lread.c | |
| parent | 41118bd30dd303cf60a70990c5347a6cfdfca1ef (diff) | |
| download | emacs-da43f02119eb86ff8a4ee8ce7454b10d261ef714.tar.gz | |
Fix int/EMACS_INT use in lread.c, marker.c, minibuf.c, print.c
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.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lread.c b/src/lread.c index a79ae180263..81b7082204c 100644 --- a/src/lread.c +++ b/src/lread.c @@ -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)) |