From 3a35a84c9389928a21056f50160ccd1cfca11b9e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 3 Jul 2010 09:44:17 +0200 Subject: [PATCH] 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. --- lib-src/ChangeLog | 12 ++++++++++++ lib-src/ebrowse.c | 2 +- lib-src/emacsclient.c | 6 +++--- lib-src/sorted-doc.c | 3 ++- src/ChangeLog | 8 ++++++++ src/cm.c | 2 +- src/cm.h | 2 +- src/lisp.h | 2 +- 8 files changed, 29 insertions(+), 8 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f9f43ad41e6..e8bb82f749c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,15 @@ +2010-07-03 Juanma Barranquero + + 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 * update-game-score.c: Convert function definitions to standard C. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 2f122cbc21d..bb3456f84e8 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -2385,7 +2385,7 @@ match_qualified_namespace_alias (void) { 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) { diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index d96925d2a3c..cb8a4ebcaf8 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -764,7 +764,7 @@ sock_err_message (char *function_name) - 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 @@ send_to_emacs (int s, char *data) 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; diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 828e8db9a0b..2c138dc348c 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -110,6 +110,7 @@ cmpdoc (DOCSTR **a, DOCSTR **b) return (*a)->type - (*b)->type; } +typedef int (*qsort_compare) (const void *, const void *); enum state { @@ -227,7 +228,7 @@ main (void) /* 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 */ diff --git a/src/ChangeLog b/src/ChangeLog index ee347e86a51..157b91f476e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2010-07-03 Juanma Barranquero + + * lisp.h (memory_warnings): Fix prototype. + + * cm.h (evalcost): Fix prototype. + + * cm.c (evalcost): Fix arg type. + 2010-07-02 Dan Nicolaescu * term.c (term_clear_mouse_face, Fidentity): diff --git a/src/cm.c b/src/cm.c index 45d6417f61f..d083c8a1be9 100644 --- a/src/cm.c +++ b/src/cm.c @@ -46,7 +46,7 @@ int cost; /* sums up costs */ /* ARGSUSED */ int evalcost (c) - char c; + int c; { cost++; return c; diff --git a/src/cm.h b/src/cm.h index 0ca4b33dc95..0ede5e0cc98 100644 --- a/src/cm.h +++ b/src/cm.h @@ -158,7 +158,7 @@ extern char PC; /* Pad character */ #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)) diff --git a/src/lisp.h b/src/lisp.h index 8f69b92d54f..2f4f3755ab8 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2668,7 +2668,7 @@ extern int pos_visible_p (struct window *, int, int *, 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); -- 2.39.2