Mercurial > emacs
changeset 109115:71150397fb59
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.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sat, 03 Jul 2010 09:44:17 +0200 |
| parents | 2f784ad8d94c |
| children | e723dd7c9121 |
| files | 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 |
| diffstat | 8 files changed, 29 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Fri Jul 02 23:16:11 2010 -0400 +++ b/lib-src/ChangeLog Sat Jul 03 09:44:17 2010 +0200 @@ -1,3 +1,15 @@ +2010-07-03 Juanma Barranquero <lekktu@gmail.com> + + 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 <dann@ics.uci.edu> * update-game-score.c: Convert function definitions to standard C.
--- a/lib-src/ebrowse.c Fri Jul 02 23:16:11 2010 -0400 +++ b/lib-src/ebrowse.c Sat Jul 03 09:44:17 2010 +0200 @@ -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) {
--- a/lib-src/emacsclient.c Fri Jul 02 23:16:11 2010 -0400 +++ b/lib-src/emacsclient.c Sat Jul 03 09:44:17 2010 +0200 @@ -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;
--- a/lib-src/sorted-doc.c Fri Jul 02 23:16:11 2010 -0400 +++ b/lib-src/sorted-doc.c Sat Jul 03 09:44:17 2010 +0200 @@ -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 */
--- a/src/ChangeLog Fri Jul 02 23:16:11 2010 -0400 +++ b/src/ChangeLog Sat Jul 03 09:44:17 2010 +0200 @@ -1,3 +1,11 @@ +2010-07-03 Juanma Barranquero <lekktu@gmail.com> + + * lisp.h (memory_warnings): Fix prototype. + + * cm.h (evalcost): Fix prototype. + + * cm.c (evalcost): Fix arg type. + 2010-07-02 Dan Nicolaescu <dann@ics.uci.edu> * term.c (term_clear_mouse_face, Fidentity):
--- a/src/cm.c Fri Jul 02 23:16:11 2010 -0400 +++ b/src/cm.c Sat Jul 03 09:44:17 2010 +0200 @@ -46,7 +46,7 @@ /* ARGSUSED */ int evalcost (c) - char c; + int c; { cost++; return c;
--- a/src/cm.h Fri Jul 02 23:16:11 2010 -0400 +++ b/src/cm.h Sat Jul 03 09:44:17 2010 +0200 @@ -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))
--- a/src/lisp.h Fri Jul 02 23:16:11 2010 -0400 +++ b/src/lisp.h Sat Jul 03 09:44:17 2010 +0200 @@ -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);