[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103167: Merge: * callint.c: conform
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103167: Merge: * callint.c: conform to C89 pointer rules |
Date: |
Sun, 06 Feb 2011 19:11:47 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103167 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 19:11:47 -0800
message:
Merge: * callint.c: conform to C89 pointer rules
modified:
src/ChangeLog
src/callint.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-07 02:51:10 +0000
+++ b/src/ChangeLog 2011-02-07 03:09:32 +0000
@@ -15,6 +15,7 @@
* editfns.c (init_editfns, Fchar_to_string, Fbyte_to_string):
(Fuser_full_name, Fsubst_char_in_region, Ftranslate_region_internal):
(Fformat): Likewise.
+ * callint.c (Fcall_interactively): Likewise.
2011-02-06 Paul Eggert <address@hidden>
=== modified file 'src/callint.c'
--- a/src/callint.c 2011-01-25 04:08:28 +0000
+++ b/src/callint.c 2011-02-07 03:09:32 +0000
@@ -257,8 +257,8 @@
int next_event;
Lisp_Object prefix_arg;
- unsigned char *string;
- unsigned char *tem;
+ char *string;
+ char *tem;
/* If varies[i] > 0, the i'th argument shouldn't just have its value
in this call quoted in the command history. It should be
@@ -325,8 +325,8 @@
{
/* Make a copy of string so that if a GC relocates specs,
`string' will still be valid. */
- string = (unsigned char *) alloca (SBYTES (specs) + 1);
- memcpy (string, SDATA (specs), SBYTES (specs) + 1);
+ string = (char *) alloca (SBYTES (specs) + 1);
+ memcpy (string, SSDATA (specs), SBYTES (specs) + 1);
}
else
{
@@ -389,7 +389,7 @@
{
if (!NILP (record_flag))
{
- unsigned char *p = string;
+ char *p = string;
while (*p)
{
if (! (*p == 'r' || *p == 'p' || *p == 'P'
@@ -449,7 +449,7 @@
j += 2;
else
j++;
- tem = (unsigned char *) strchr (tem, '\n');
+ tem = strchr (tem, '\n');
if (tem)
++tem;
else
@@ -780,7 +780,7 @@
case '+':
default:
error ("Invalid control letter `%c' (%03o) in interactive calling
string",
- *tem, *tem);
+ *tem, (unsigned char) *tem);
}
if (varies[i] == 0)
@@ -789,9 +789,9 @@
if (NILP (visargs[i]) && STRINGP (args[i]))
visargs[i] = args[i];
- tem = (unsigned char *) strchr (tem, '\n');
+ tem = strchr (tem, '\n');
if (tem) tem++;
- else tem = (unsigned char *) "";
+ else tem = "";
}
unbind_to (speccount, Qnil);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103167: Merge: * callint.c: conform to C89 pointer rules,
Paul Eggert <=