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/insque.c | |
| parent | aefd87e148d11777492fc068f3eddf2945cfbfc5 (diff) | |
| download | emacs-55660072db3bb05d1daba0eb67865913b82d313a.tar.gz emacs-55660072db3bb05d1daba0eb67865913b82d313a.tar.bz2 emacs-55660072db3bb05d1daba0eb67865913b82d313a.zip | |
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/insque.c')
| -rw-r--r-- | oldXMenu/insque.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index b324ade1d55..90a8eec4e71 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c @@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ their callers have been renamed to emacs_mumble to allow us to include this file in the menu library on all systems. */ +#include "XMenuInt.h" struct qelem { struct qelem *q_forw; @@ -29,8 +30,10 @@ struct qelem { /* Insert ELEM into a doubly-linked list, after PREV. */ void -emacs_insque (struct qelem *elem, struct qelem *prev) +emacs_insque (void *velem, void *vprev) { + struct qelem *elem = velem; + struct qelem *prev = vprev; struct qelem *next = prev->q_forw; prev->q_forw = elem; if (next) @@ -41,8 +44,10 @@ emacs_insque (struct qelem *elem, struct qelem *prev) /* Unlink ELEM from the doubly-linked list that it is in. */ -emacs_remque (struct qelem *elem) +void +emacs_remque (void *velem) { + struct qelem *elem = velem; struct qelem *next = elem->q_forw; struct qelem *prev = elem->q_back; if (next) @@ -50,4 +55,3 @@ emacs_remque (struct qelem *elem) if (prev) prev->q_forw = next; } - |