[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103147: Merge: * insdel.c: conform t
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103147: Merge: * insdel.c: conform to C89 pointer rules |
|
Date: |
Sun, 06 Feb 2011 11:45:23 -0800 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103147 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 11:45:23 -0800
message:
Merge: * insdel.c: conform to C89 pointer rules
modified:
src/ChangeLog
src/buffer.c
src/cmds.c
src/coding.c
src/editfns.c
src/fileio.c
src/insdel.c
src/lisp.h
src/print.c
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-06 09:03:25 +0000
+++ b/src/ChangeLog 2011-02-06 19:44:36 +0000
@@ -17,6 +17,13 @@
* image.c (xbm_read_bitmap_data, xbm_load_image, xbm_load): Likewise.
* keyboard.c (echo_char, MULTI_LETTER_MOD, tty_read_avail_input):
Likewise.
+ * insdel.c (insert, insert_and_inherit, insert_before_markers):
+ (insert_before_markers_and_inherit, insert_1, insert_1_both):
+ Likewise. This changes these functions' signatures, which is
+ more convenient since most callers use char *. All remaining
+ callers changed.
+ * editfns.c (general_insert_function): Change signature to
+ match changes to insert functions' signatures.
2011-02-05 Paul Eggert <address@hidden>
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2011-01-30 22:17:44 +0000
+++ b/src/buffer.c 2011-02-06 19:44:36 +0000
@@ -2401,7 +2401,7 @@
*p = tmp[0];
TEMP_SET_PT_BOTH (pos + 1, pos + 1);
bytes--;
- insert_1_both (tmp + 1, bytes, bytes, 1, 0, 0);
+ insert_1_both ((char *) tmp + 1, bytes, bytes, 1, 0, 0);
/* Now the gap is after the just inserted data. */
pos = GPT;
p = GAP_END_ADDR;
=== modified file 'src/cmds.c'
--- a/src/cmds.c 2011-01-26 08:36:39 +0000
+++ b/src/cmds.c 2011-02-06 19:44:36 +0000
@@ -466,15 +466,15 @@
else if (n > 1)
{
USE_SAFE_ALLOCA;
- unsigned char *strn, *p;
- SAFE_ALLOCA (strn, unsigned char*, n * len);
+ char *strn, *p;
+ SAFE_ALLOCA (strn, char *, n * len);
for (p = strn; n > 0; n--, p += len)
memcpy (p, str, len);
insert_and_inherit (strn, p - strn);
SAFE_FREE ();
}
else if (n > 0)
- insert_and_inherit (str, len);
+ insert_and_inherit ((char *) str, len);
if ((CHAR_TABLE_P (Vauto_fill_chars)
? !NILP (CHAR_TABLE_REF (Vauto_fill_chars, c))
@@ -559,4 +559,3 @@
initial_define_key (global_map, Ctl ('E'), "end-of-line");
initial_define_key (global_map, Ctl ('F'), "forward-char");
}
-
=== modified file 'src/coding.c'
--- a/src/coding.c 2011-01-25 04:08:28 +0000
+++ b/src/coding.c 2011-02-06 19:44:36 +0000
@@ -7880,7 +7880,7 @@
else if (BUFFERP (src_object))
insert_from_buffer (XBUFFER (src_object), from, chars, 0);
else
- insert_1_both (coding->source + from, chars, bytes, 0, 0, 0);
+ insert_1_both ((char *) coding->source + from, chars, bytes, 0, 0, 0);
if (EQ (src_object, dst_object))
{
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2011-02-05 22:30:14 +0000
+++ b/src/editfns.c 2011-02-06 19:44:36 +0000
@@ -94,7 +94,7 @@
static Lisp_Object region_limit (int);
static size_t emacs_nmemftime (char *, size_t, const char *,
size_t, const struct tm *, int, int);
-static void general_insert_function (void (*) (const unsigned char *,
EMACS_INT),
+static void general_insert_function (void (*) (const char *, EMACS_INT),
void (*) (Lisp_Object, EMACS_INT,
EMACS_INT, EMACS_INT,
EMACS_INT, int),
@@ -2118,7 +2118,7 @@
static void
general_insert_function (void (*insert_func)
- (const unsigned char *, EMACS_INT),
+ (const char *, EMACS_INT),
void (*insert_from_string_func)
(Lisp_Object, EMACS_INT, EMACS_INT,
EMACS_INT, EMACS_INT, int),
@@ -2144,7 +2144,7 @@
: multibyte_char_to_unibyte (XINT (val), Qnil));
len = 1;
}
- (*insert_func) (str, len);
+ (*insert_func) ((char *) str, len);
}
else if (STRINGP (val))
{
@@ -2257,7 +2257,7 @@
from adjoining text, if those properties are sticky. */)
(Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
{
- register unsigned char *string;
+ register char *string;
register EMACS_INT strlen;
register int i;
register EMACS_INT n;
@@ -2277,7 +2277,7 @@
if (n <= 0)
return Qnil;
strlen = min (n, 256 * len);
- string = (unsigned char *) alloca (strlen);
+ string = (char *) alloca (strlen);
for (i = 0; i < strlen; i++)
string[i] = str[i % len];
while (n >= strlen)
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2011-01-30 22:17:44 +0000
+++ b/src/fileio.c 2011-02-06 19:44:36 +0000
@@ -3412,7 +3412,7 @@
Ferase_buffer ();
buf->enable_multibyte_characters = Qnil;
- insert_1_both (read_buf, nread, nread, 0, 0, 0);
+ insert_1_both ((char *) read_buf, nread, nread, 0, 0, 0);
TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
coding_system = call2 (Vset_auto_coding_function,
filename, make_number (nread));
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2011-01-25 04:08:28 +0000
+++ b/src/insdel.c 2011-02-06 19:44:36 +0000
@@ -668,11 +668,11 @@
prepare_to_modify_buffer could relocate the text. */
void
-insert (const unsigned char *string, EMACS_INT nbytes)
+insert (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@ -683,11 +683,11 @@
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_and_inherit (const unsigned char *string, EMACS_INT nbytes)
+insert_and_inherit (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@ -711,7 +711,7 @@
str[0] = c;
}
- insert (str, len);
+ insert ((char *) str, len);
}
/* Insert the null-terminated string S before point. */
@@ -728,11 +728,11 @@
since gc could happen and relocate it. */
void
-insert_before_markers (const unsigned char *string, EMACS_INT nbytes)
+insert_before_markers (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@ -743,12 +743,12 @@
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_before_markers_and_inherit (const unsigned char *string,
+insert_before_markers_and_inherit (const char *string,
EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
@@ -759,11 +759,11 @@
/* Subroutine used by the insert functions above. */
void
-insert_1 (const unsigned char *string, EMACS_INT nbytes,
+insert_1 (const char *string, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
- insert_1_both (string, chars_in_text (string, nbytes), nbytes,
- inherit, prepare, before_markers);
+ insert_1_both (string, chars_in_text ((unsigned char *) string, nbytes),
+ nbytes, inherit, prepare, before_markers);
}
@@ -884,7 +884,7 @@
are the same as in insert_1. */
void
-insert_1_both (const unsigned char *string,
+insert_1_both (const char *string,
EMACS_INT nchars, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
@@ -2382,4 +2382,3 @@
defsubr (&Scombine_after_change_execute);
}
-
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2011-01-25 04:08:28 +0000
+++ b/src/lisp.h 2011-02-06 19:44:36 +0000
@@ -2555,10 +2555,10 @@
EMACS_INT, EMACS_INT, EMACS_INT);
extern int count_combining_after (const unsigned char *,
EMACS_INT, EMACS_INT, EMACS_INT);
-extern void insert (const unsigned char *, EMACS_INT);
-extern void insert_and_inherit (const unsigned char *, EMACS_INT);
-extern void insert_1 (const unsigned char *, EMACS_INT, int, int, int);
-extern void insert_1_both (const unsigned char *, EMACS_INT, EMACS_INT,
+extern void insert (const char *, EMACS_INT);
+extern void insert_and_inherit (const char *, EMACS_INT);
+extern void insert_1 (const char *, EMACS_INT, int, int, int);
+extern void insert_1_both (const char *, EMACS_INT, EMACS_INT,
int, int, int);
extern void insert_from_gap (EMACS_INT, EMACS_INT);
extern void insert_from_string (Lisp_Object, EMACS_INT, EMACS_INT,
@@ -2566,9 +2566,8 @@
extern void insert_from_buffer (struct buffer *, EMACS_INT, EMACS_INT, int);
extern void insert_char (int);
extern void insert_string (const char *);
-extern void insert_before_markers (const unsigned char *, EMACS_INT);
-extern void insert_before_markers_and_inherit (const unsigned char *,
- EMACS_INT);
+extern void insert_before_markers (const char *, EMACS_INT);
+extern void insert_before_markers_and_inherit (const char *, EMACS_INT);
extern void insert_from_string_before_markers (Lisp_Object, EMACS_INT,
EMACS_INT, EMACS_INT,
EMACS_INT, int);
=== modified file 'src/print.c'
--- a/src/print.c 2011-01-30 22:17:44 +0000
+++ b/src/print.c 2011-02-06 19:44:36 +0000
@@ -179,7 +179,7 @@
= (unsigned char *) alloca (print_buffer_pos + 1); \
copy_text (print_buffer, temp, print_buffer_pos_byte, \
1, 0); \
- insert_1_both (temp, print_buffer_pos, \
+ insert_1_both ((char *) temp, print_buffer_pos, \
print_buffer_pos, 0, 1, 0); \
} \
else \
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2011-02-05 09:26:46 +0000
+++ b/src/xdisp.c 2011-02-06 19:44:36 +0000
@@ -7930,7 +7930,7 @@
{
EMACS_INT i;
int c, char_bytes;
- unsigned char work[1];
+ char work[1];
/* Convert a multibyte string to single-byte
for the *Message* buffer. */
@@ -7956,17 +7956,17 @@
c = msg[i];
MAKE_CHAR_MULTIBYTE (c);
char_bytes = CHAR_STRING (c, str);
- insert_1_both (str, 1, char_bytes, 1, 0, 0);
+ insert_1_both ((char *) str, 1, char_bytes, 1, 0, 0);
}
}
else if (nbytes)
- insert_1 (msg, nbytes, 1, 0, 0);
+ insert_1 (m, nbytes, 1, 0, 0);
if (nlflag)
{
EMACS_INT this_bol, this_bol_byte, prev_bol, prev_bol_byte;
int dup;
- insert_1 ((const unsigned char *) "\n", 1, 1, 0, 0);
+ insert_1 ("\n", 1, 1, 0, 0);
scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
this_bol = PT;
@@ -7996,7 +7996,7 @@
sprintf (dupstr, " [%d times]", dup);
duplen = strlen (dupstr);
TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
- insert_1 ((unsigned char *) dupstr, duplen, 1, 0, 1);
+ insert_1 (dupstr, duplen, 1, 0, 1);
}
}
}
@@ -9193,7 +9193,7 @@
/* Convert from multi-byte to single-byte. */
EMACS_INT i;
int c, n;
- unsigned char work[1];
+ char work[1];
/* Convert a multibyte string to single-byte. */
for (i = 0; i < nbytes; i += n)
@@ -9219,11 +9219,11 @@
c = msg[i];
MAKE_CHAR_MULTIBYTE (c);
n = CHAR_STRING (c, str);
- insert_1_both (str, 1, n, 1, 0, 0);
+ insert_1_both ((char *) str, 1, n, 1, 0, 0);
}
}
else
- insert_1 (msg, nbytes, 1, 0, 0);
+ insert_1 (s, nbytes, 1, 0, 0);
}
return 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103147: Merge: * insdel.c: conform to C89 pointer rules,
Paul Eggert <=