diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-16 01:25:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-16 01:25:42 -0700 |
| commit | 55660072db3bb05d1daba0eb67865913b82d313a (patch) | |
| tree | bbeda328257b0960f227c5509224077c7cf9c158 /oldXMenu/XMakeAssoc.c | |
| parent | aefd87e148d11777492fc068f3eddf2945cfbfc5 (diff) | |
| download | emacs-55660072db3bb05d1daba0eb67865913b82d313a.tar.gz | |
Modernize to C89, for better static checking.
* Activate.c (XMenuActivate): Callback's first arg is readonly.
* AddPane.c (XMenuAddPane): Label is readonly. Rename local
to avoid shadowing.
* AddSel.c (XMenuAddSelection): Help arg is readonly. Rename local.
* Create.c (atoi, atof): Remove decls; include <stdlib.h>.
(MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused.
(x_get_resource_string): Args are readonly.
(XAllocDisplayColor): colorName is readonly.
(XMenuCreate): def_env is readonly. Remove unused locals. Avoid
"else;".
* Destroy.c (XMenuDestroy): Return void.
* Error.c (XMenuError): Remove const pointer.
* EvHand.c (XMenuEventHandler): Return void.
* FindPane.c, FindSel.c: Include <string.h>.
* InsPane.c (XMenuInsertPane): Rename local to avoid shadowing.
* InsSel.c (XMenuInsertSelection): Likewise.
* Internal.c (toggle_color, BUFFER_SIZE): Remove; unused.
(_XMErrorList): Now const.
(_XMWinQueInit, _XMRecomputeGlobals, _XMTransToOrigin, _XMRefreshPane):
(_XMRefreshSelection): Return void.
(_XMWinQueFlush, _XMRefreshSelection): Rename locals to avoid
shadowing.
(_XMWinQueFlush): Use stack, not heap. Don't use uninitialized var.
* SetAEQ.c (XMenuSetAEQ): Now returns void.
* SetFrz.c (XMenuSetFreeze): Likewise.
* X10.h (XAssoc): Use void * for generic pointer.
* XDelAssoc.c: Include XMenuInt.h rather than duplicating part of it.
* XDestAssoc.c, XMakeAssoc.c: Likewise.
* XDestAssoc.c (XDestroyAssocTable): Return void.
* XMakeAssoc.c (XMakeAssoc): Use void * for generic pointer.
* XMenu.h, XMenuInt.h: Adjust to signature changes. Use const
for pointers to readonly storage.
* insque.c: Include XMenuInt.h, to check our own signature.
(emacs_insque, emacs_remque): Use void * for generic pointers.
Diffstat (limited to 'oldXMenu/XMakeAssoc.c')
| -rw-r--r-- | oldXMenu/XMakeAssoc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c index 3626eb01f52..143b2641112 100644 --- a/oldXMenu/XMakeAssoc.c +++ b/oldXMenu/XMakeAssoc.c @@ -4,22 +4,14 @@ #include <config.h> -#include <X11/Xlib.h> +#include "XMenuInt.h" #include <X11/Xresource.h> -#include "X10.h" #include <errno.h> #ifndef NULL #define NULL 0 #endif -struct qelem { - struct qelem *q_forw; - struct qelem *q_back; - char q_data[1]; -}; -void emacs_insque (struct qelem *elem, struct qelem *prev); - /* * XMakeAssoc - Insert data into an XAssocTable keyed on an XId. * Data is inserted into the table only once. Redundant inserts are @@ -27,7 +19,7 @@ void emacs_insque (struct qelem *elem, struct qelem *prev); * bucket is sorted (lowest XId to highest XId). */ void -XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data) +XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register void *data) { int hash; register XAssoc *bucket; @@ -85,4 +77,3 @@ XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id /* Insert the new entry. */ emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev); } - |