[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103172: Merge: * doprnt.c, indent.c,
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103172: Merge: * doprnt.c, indent.c, character.c: conform to C89 pointer rules |
Date: |
Sun, 06 Feb 2011 21:42:51 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103172 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 21:42:51 -0800
message:
Merge: * doprnt.c, indent.c, character.c: conform to C89 pointer rules
modified:
src/ChangeLog
src/character.c
src/character.h
src/doprnt.c
src/indent.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-07 05:06:59 +0000
+++ b/src/ChangeLog 2011-02-07 05:42:15 +0000
@@ -24,6 +24,11 @@
* process.c (read_process_output, send_process, Fprocess_send_region):
Likewise.
* callproc.c (Fcall_process): Likewise.
+ * doprnt.c (doprnt): Likewise.
+ * indent.c (compute_motion): Likewise.
+ * character.c (strwidth): Make its argument const char *, not const
+ unsigned char *, since more callers prefer it that way. All callers
+ changed.
2011-02-06 Paul Eggert <address@hidden>
=== modified file 'src/character.c'
--- a/src/character.c 2011-01-25 04:08:28 +0000
+++ b/src/character.c 2011-02-07 05:42:15 +0000
@@ -395,9 +395,9 @@
occupies on the screen. */
EMACS_INT
-strwidth (const unsigned char *str, EMACS_INT len)
+strwidth (const char *str, EMACS_INT len)
{
- return c_string_width (str, len, -1, NULL, NULL);
+ return c_string_width ((const unsigned char *) str, len, -1, NULL, NULL);
}
/* Return width of Lisp string STRING when displayed in the current
=== modified file 'src/character.h'
--- a/src/character.h 2011-01-18 20:45:37 +0000
+++ b/src/character.h 2011-02-07 05:42:15 +0000
@@ -612,7 +612,7 @@
extern EMACS_INT str_as_unibyte (unsigned char *, EMACS_INT);
extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *,
EMACS_INT, int);
-extern EMACS_INT strwidth (const unsigned char *, EMACS_INT);
+extern EMACS_INT strwidth (const char *, EMACS_INT);
extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int,
EMACS_INT *, EMACS_INT *);
extern EMACS_INT lisp_string_width (Lisp_Object, int,
@@ -630,4 +630,3 @@
do { (sym) = intern_c_string ((name)); staticpro (&(sym)); } while (0)
#endif /* EMACS_CHARACTER_H */
-
=== modified file 'src/doprnt.c'
--- a/src/doprnt.c 2011-01-25 04:08:28 +0000
+++ b/src/doprnt.c 2011-02-07 05:42:15 +0000
@@ -71,11 +71,11 @@
char *big_buffer = 0;
register int tem;
- unsigned char *string;
+ char *string;
char fixed_buffer[20]; /* Default buffer for small formatting. */
char *fmtcpy;
int minlen;
- unsigned char charbuf[MAX_MULTIBYTE_LENGTH + 1]; /* Used for %c. */
+ char charbuf[MAX_MULTIBYTE_LENGTH + 1]; /* Used for %c. */
if (format_end == 0)
format_end = format + strlen (format);
@@ -97,7 +97,7 @@
fmt++;
/* Copy this one %-spec into fmtcpy. */
- string = (unsigned char *) fmtcpy;
+ string = fmtcpy;
*string++ = '%';
while (1)
{
@@ -166,7 +166,7 @@
abort ();
sprintf (sprintf_buffer, fmtcpy, va_arg(ap, char *));
/* Now copy into final output, truncating as nec. */
- string = (unsigned char *) sprintf_buffer;
+ string = sprintf_buffer;
goto doit;
case 'f':
@@ -176,7 +176,7 @@
double d = va_arg(ap, double);
sprintf (sprintf_buffer, fmtcpy, d);
/* Now copy into final output, truncating as nec. */
- string = (unsigned char *) sprintf_buffer;
+ string = sprintf_buffer;
goto doit;
}
@@ -185,7 +185,7 @@
case 's':
if (fmtcpy[1] != 's')
minlen = atoi (&fmtcpy[1]);
- string = va_arg(ap, unsigned char *);
+ string = va_arg (ap, char *);
tem = strlen (string);
width = strwidth (string, tem);
goto doit1;
@@ -242,7 +242,7 @@
both are passed the same way, otherwise we'll need
to rewrite callers. */
EMACS_INT chr = va_arg(ap, EMACS_INT);
- tem = CHAR_STRING ((int) chr, charbuf);
+ tem = CHAR_STRING ((int) chr, (unsigned char *) charbuf);
string = charbuf;
string[tem] = 0;
width = strwidth (string, tem);
@@ -277,4 +277,3 @@
*bufptr = 0; /* Make sure our string end with a '\0' */
return bufptr - buffer;
}
-
=== modified file 'src/indent.c'
--- a/src/indent.c 2011-01-30 22:17:44 +0000
+++ b/src/indent.c 2011-02-07 05:42:15 +0000
@@ -1250,7 +1250,7 @@
unsigned char *ovstr;
EMACS_INT ovlen = overlay_strings (pos, win, &ovstr);
hpos += ((multibyte && ovlen > 0)
- ? strwidth (ovstr, ovlen) : ovlen);
+ ? strwidth ((char *) ovstr, ovlen) : ovlen);
}
did_motion = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103172: Merge: * doprnt.c, indent.c, character.c: conform to C89 pointer rules,
Paul Eggert <=