[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103164: Merge: * data.c etc: conform
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103164: Merge: * data.c etc: conform to C89 pointer rules |
Date: |
Sun, 06 Feb 2011 18:19:13 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103164 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 18:19:13 -0800
message:
Merge: * data.c etc: conform to C89 pointer rules
modified:
src/ChangeLog
src/data.c
src/lisp.h
src/print.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-07 02:05:30 +0000
+++ b/src/ChangeLog 2011-02-07 02:18:35 +0000
@@ -9,6 +9,8 @@
* search.c (Freplace_match, Fregexp_quote): Likewise.
* alloc.c (make_string, make_specified_string, make_pure_string):
Likewise.
+ * data.c (Fstring_to_number): Likewise.
+ * print.c (float_to_string): Likewise.
2011-02-06 Paul Eggert <address@hidden>
=== modified file 'src/data.c'
--- a/src/data.c 2011-01-25 04:08:28 +0000
+++ b/src/data.c 2011-02-07 02:18:35 +0000
@@ -2417,7 +2417,7 @@
If the base used is not 10, STRING is always parsed as integer. */)
(register Lisp_Object string, Lisp_Object base)
{
- register unsigned char *p;
+ register char *p;
register int b;
int sign = 1;
Lisp_Object val;
@@ -2436,7 +2436,7 @@
/* Skip any whitespace at the front of the number. Some versions of
atoi do this anyway, so we might as well make Emacs lisp consistent. */
- p = SDATA (string);
+ p = SSDATA (string);
while (*p == ' ' || *p == '\t')
p++;
@@ -3334,4 +3334,3 @@
signal (SIGEMT, arith_error);
#endif /* uts */
}
-
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2011-02-06 19:44:36 +0000
+++ b/src/lisp.h 2011-02-07 02:18:35 +0000
@@ -2787,7 +2787,7 @@
extern Lisp_Object internal_with_output_to_temp_buffer
(const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
#define FLOAT_TO_STRING_BUFSIZE 350
-extern void float_to_string (unsigned char *, double);
+extern void float_to_string (char *, double);
extern void syms_of_print (void);
/* Defined in doprnt.c */
=== modified file 'src/print.c'
--- a/src/print.c 2011-02-06 19:44:36 +0000
+++ b/src/print.c 2011-02-07 02:18:35 +0000
@@ -1016,9 +1016,9 @@
*/
void
-float_to_string (unsigned char *buf, double data)
+float_to_string (char *buf, double data)
{
- unsigned char *cp;
+ char *cp;
int width;
/* Check for plus infinity in a way that won't lose
@@ -1067,7 +1067,7 @@
/* Check that the spec we have is fully valid.
This means not only valid for printf,
but meant for floats, and reasonable. */
- cp = SDATA (Vfloat_output_format);
+ cp = SSDATA (Vfloat_output_format);
if (cp[0] != '%')
goto lose;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103164: Merge: * data.c etc: conform to C89 pointer rules,
Paul Eggert <=