[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101591: Fix all EMACS_INT/int conver
From: |
Lars Magne Ingebrigtsen |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101591: Fix all EMACS_INT/int conversion errors in print.c (and related files). |
Date: |
Fri, 24 Sep 2010 17:01:03 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101591
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-24 17:01:03 +0200
message:
Fix all EMACS_INT/int conversion errors in print.c (and related files).
modified:
src/ChangeLog
src/eval.c
src/lisp.h
src/print.c
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-09-24 13:32:25 +0000
+++ b/src/ChangeLog 2010-09-24 15:01:03 +0000
@@ -1,3 +1,15 @@
+2010-09-24 Lars Magne Ingebrigtsen <address@hidden>
+
+ * xdisp.c (message_dolog): Fix EMACS_INT/int conversion.
+
+ * eval.c (verror): Fix EMACS_INT/int conversion.
+
+ * print.c: (PRINTDECLARE, PRINTPREPARE, strout, print_string)
+ (print_preprocess, print_check_string_charset_prop)
+ (print_object): Fix EMACS_INT/int conversion.
+
+ * xdisp.c (message_dolog): Fix EMACS_INT/int conversion.
+
2010-09-24 Eli Zaretskii <address@hidden>
* callproc.c (Fcall_process): Use EMACS_INT for count of
@@ -52,6 +64,8 @@
2010-09-23 Lars Magne Ingebrigtsen <address@hidden>
+ * eval.c (verror): EMACS_INT/int cleanup.
+
* lisp.h (SPECPDL_INDEX): Cast to int, since we're not going to
unwind_protect more than 2GB worth of functions.
=== modified file 'src/eval.c'
--- a/src/eval.c 2010-08-22 20:02:16 +0000
+++ b/src/eval.c 2010-09-24 15:01:03 +0000
@@ -2003,7 +2003,7 @@
while (1)
{
- int used;
+ EMACS_INT used;
used = doprnt (buffer, size, m, m + mlen, ap);
if (used < size)
break;
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2010-09-24 12:45:09 +0000
+++ b/src/lisp.h 2010-09-24 15:01:03 +0000
@@ -2667,7 +2667,7 @@
extern void message2_nolog (const char *, int, int);
extern void message3 (Lisp_Object, int, int);
extern void message3_nolog (Lisp_Object, int, int);
-extern void message_dolog (const char *, int, int, int);
+extern void message_dolog (const char *, EMACS_INT, int, int);
extern void message_with_string (const char *, Lisp_Object, int);
extern void message_log_maybe_newline (void);
extern void update_echo_area (void);
=== modified file 'src/print.c'
--- a/src/print.c 2010-08-05 23:34:12 +0000
+++ b/src/print.c 2010-09-24 15:01:03 +0000
@@ -96,11 +96,11 @@
char *print_buffer;
/* Size allocated in print_buffer. */
-int print_buffer_size;
+EMACS_INT print_buffer_size;
/* Chars stored in print_buffer. */
-int print_buffer_pos;
+EMACS_INT print_buffer_pos;
/* Bytes stored in print_buffer. */
-int print_buffer_pos_byte;
+EMACS_INT print_buffer_pos_byte;
/* Maximum length of list to print in full; noninteger means
effectively infinity */
@@ -177,8 +177,8 @@
#define PRINTDECLARE \
struct buffer *old = current_buffer;
\
- int old_point = -1, start_point = -1; \
- int old_point_byte = -1, start_point_byte = -1; \
+ EMACS_INT old_point = -1, start_point = -1; \
+ EMACS_INT old_point_byte = -1, start_point_byte = -1; \
int specpdl_count = SPECPDL_INDEX (); \
int free_print_buffer = 0; \
int multibyte = !NILP (current_buffer->enable_multibyte_characters);
\
@@ -342,8 +342,8 @@
to data in a Lisp string. Otherwise that is not safe. */
static void
-strout (const char *ptr, int size, int size_byte, Lisp_Object printcharfun,
- int multibyte)
+strout (const char *ptr, EMACS_INT size, EMACS_INT size_byte,
+ Lisp_Object printcharfun, int multibyte)
{
if (size < 0)
size_byte = size = strlen (ptr);
@@ -430,7 +430,7 @@
{
if (EQ (printcharfun, Qt) || NILP (printcharfun))
{
- int chars;
+ EMACS_INT chars;
if (print_escape_nonascii)
string = string_escape_byte8 (string);
@@ -446,7 +446,7 @@
convert STRING to a multibyte string containing the same
character codes. */
Lisp_Object newstr;
- int bytes;
+ EMACS_INT bytes;
chars = SBYTES (string);
bytes = parse_str_to_multibyte (SDATA (string), chars);
@@ -464,7 +464,7 @@
if (EQ (printcharfun, Qt))
{
/* Output to echo area. */
- int nbytes = SBYTES (string);
+ EMACS_INT nbytes = SBYTES (string);
char *buffer;
/* Copy the string contents so that relocation of STRING by
@@ -490,8 +490,8 @@
/* Otherwise, string may be relocated by printing one char.
So re-fetch the string address for each character. */
int i;
- int size = SCHARS (string);
- int size_byte = SBYTES (string);
+ EMACS_INT size = SCHARS (string);
+ EMACS_INT size_byte = SBYTES (string);
struct gcpro gcpro1;
GCPRO1 (string);
if (size == size_byte)
@@ -868,7 +868,7 @@
(Lisp_Object character)
{
CHECK_NUMBER (character);
- putc (XINT (character), stderr);
+ putc ((int) XINT (character), stderr);
#ifdef WINDOWSNT
/* Send the output to a debugger (nothing happens if there isn't one). */
@@ -1430,8 +1430,8 @@
|| ! (print_check_string_result & PRINT_STRING_UNSAFE_CHARSET_FOUND))
{
int i, c;
- int charpos = interval->position;
- int bytepos = string_char_to_byte (string, charpos);
+ EMACS_INT charpos = interval->position;
+ EMACS_INT bytepos = string_char_to_byte (string, charpos);
Lisp_Object charset;
charset = XCAR (XCDR (val));
@@ -1566,7 +1566,7 @@
register int i, i_byte;
struct gcpro gcpro1;
unsigned char *str;
- int size_byte;
+ EMACS_INT size_byte;
/* 1 means we must ensure that the next character we output
cannot be taken as part of a hex character escape. */
int need_nonhex = 0;
@@ -1684,7 +1684,8 @@
register unsigned char *p = SDATA (SYMBOL_NAME (obj));
register unsigned char *end = p + SBYTES (SYMBOL_NAME (obj));
register int c;
- int i, i_byte, size_byte;
+ int i, i_byte;
+ EMACS_INT size_byte;
Lisp_Object name;
name = SYMBOL_NAME (obj);
@@ -1803,7 +1804,8 @@
}
{
- int print_length, i;
+ EMACS_INT print_length;
+ int i;
Lisp_Object halftail = obj;
/* Negative values of print-length are invalid in CL.
@@ -1898,7 +1900,7 @@
register int i;
register unsigned char c;
struct gcpro gcpro1;
- int size_in_chars
+ EMACS_INT size_in_chars
= ((XBOOL_VECTOR (obj)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
/ BOOL_VECTOR_BITS_PER_CHAR);
@@ -1984,7 +1986,8 @@
else if (HASH_TABLE_P (obj))
{
struct Lisp_Hash_Table *h = XHASH_TABLE (obj);
- int i, real_size, size;
+ int i;
+ EMACS_INT real_size, size;
#if 0
strout ("#<hash-table", -1, -1, printcharfun, 0);
if (SYMBOLP (h->test))
@@ -2150,7 +2153,7 @@
{
register int i;
register Lisp_Object tem;
- int real_size = size;
+ EMACS_INT real_size = size;
/* Don't print more elements than the specified maximum. */
if (NATNUMP (Vprint_length)
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2010-09-23 14:32:38 +0000
+++ b/src/xdisp.c 2010-09-24 15:01:03 +0000
@@ -7990,7 +7990,7 @@
so the buffer M must NOT point to a Lisp string. */
void
-message_dolog (const char *m, int nbytes, int nlflag, int multibyte)
+message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
{
if (!NILP (Vmemory_full))
return;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101591: Fix all EMACS_INT/int conversion errors in print.c (and related files).,
Lars Magne Ingebrigtsen <=