[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100699: Fix prototypes.
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100699: Fix prototypes. |
Date: |
Sat, 03 Jul 2010 09:44:17 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100699
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2010-07-03 09:44:17 +0200
message:
Fix prototypes.
* src/cm.c (evalcost): Fix arg type.
* src/cm.h (evalcost): Fix prototype.
* src/lisp.h (memory_warnings): Fix prototype.
* lib-src/ebrowse.c (match_qualified_namespace_alias):
Pass sym* to find_namespace, not link*.
* lib-src/emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET.
* lib-src/sorted-doc.c (qsort_compare): New typedef.
(main): Use it to cast cmpdoc.
modified:
lib-src/ChangeLog
lib-src/ebrowse.c
lib-src/emacsclient.c
lib-src/sorted-doc.c
src/ChangeLog
src/cm.c
src/cm.h
src/lisp.h
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-07-03 00:50:23 +0000
+++ b/lib-src/ChangeLog 2010-07-03 07:44:17 +0000
@@ -1,3 +1,15 @@
+2010-07-03 Juanma Barranquero <address@hidden>
+
+ Fix prototype warnings.
+
+ * ebrowse.c (match_qualified_namespace_alias):
+ Pass sym* to find_namespace, not link*.
+
+ * emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET.
+
+ * sorted-doc.c (qsort_compare): New typedef.
+ (main): Use it to cast cmpdoc.
+
2010-07-03 Dan Nicolaescu <address@hidden>
* update-game-score.c: Convert function definitions to standard C.
=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2010-07-03 00:50:23 +0000
+++ b/lib-src/ebrowse.c 2010-07-03 07:44:17 +0000
@@ -2385,7 +2385,7 @@
{
case IDENT:
tmp = (struct link *) xmalloc (sizeof *cur);
- tmp->sym = find_namespace (yytext, cur);
+ tmp->sym = find_namespace (yytext, cur->sym);
tmp->next = NULL;
if (head)
{
=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c 2010-07-03 00:50:23 +0000
+++ b/lib-src/emacsclient.c 2010-07-03 07:44:17 +0000
@@ -764,7 +764,7 @@
- the buffer is full (but this shouldn't happen)
Otherwise, we just accumulate it. */
void
-send_to_emacs (int s, char *data)
+send_to_emacs (HSOCKET s, char *data)
{
while (data)
{
@@ -801,9 +801,9 @@
any initial -. Change spaces to underscores, too, so that the
return value never contains a space.
- Does not change the string. Outputs the result to STREAM. */
+ Does not change the string. Outputs the result to S. */
void
-quote_argument (int s, char *str)
+quote_argument (HSOCKET s, char *str)
{
char *copy = (char *) xmalloc (strlen (str) * 2 + 1);
char *p, *q;
=== modified file 'lib-src/sorted-doc.c'
--- a/lib-src/sorted-doc.c 2010-07-03 00:50:23 +0000
+++ b/lib-src/sorted-doc.c 2010-07-03 07:44:17 +0000
@@ -110,6 +110,7 @@
return (*a)->type - (*b)->type;
}
+typedef int (*qsort_compare) (const void *, const void *);
enum state
{
@@ -227,7 +228,7 @@
/* sort the array by name; within each name, by type */
- qsort ((char*)array, cnt, sizeof (DOCSTR*), cmpdoc);
+ qsort ((char*)array, cnt, sizeof (DOCSTR*), (qsort_compare)cmpdoc);
/* write the output header */
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-02 22:18:28 +0000
+++ b/src/ChangeLog 2010-07-03 07:44:17 +0000
@@ -1,3 +1,11 @@
+2010-07-03 Juanma Barranquero <address@hidden>
+
+ * lisp.h (memory_warnings): Fix prototype.
+
+ * cm.h (evalcost): Fix prototype.
+
+ * cm.c (evalcost): Fix arg type.
+
2010-07-02 Dan Nicolaescu <address@hidden>
* term.c (term_clear_mouse_face, Fidentity):
=== modified file 'src/cm.c'
--- a/src/cm.c 2010-07-02 12:19:53 +0000
+++ b/src/cm.c 2010-07-03 07:44:17 +0000
@@ -46,7 +46,7 @@
/* ARGSUSED */
int
evalcost (c)
- char c;
+ int c;
{
cost++;
return c;
=== modified file 'src/cm.h'
--- a/src/cm.h 2010-07-02 22:18:28 +0000
+++ b/src/cm.h 2010-07-03 07:44:17 +0000
@@ -158,7 +158,7 @@
#define losecursor(tty) (curX(tty) = -1, curY(tty) = -1)
extern int cost;
-extern int evalcost (char c);
+extern int evalcost (int c);
#define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str,
affcnt, putc))
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2010-07-02 22:18:28 +0000
+++ b/src/lisp.h 2010-07-03 07:44:17 +0000
@@ -2668,7 +2668,7 @@
extern void syms_of_xsettings (void);
/* Defined in vm-limit.c. */
-extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (const char*));
+extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (char*));
/* Defined in alloc.c */
extern void check_pure_size (void);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100699: Fix prototypes.,
Juanma Barranquero <=