diff options
author | Paul Eggert <[email protected]> | 2011-04-16 01:25:42 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-04-16 01:25:42 -0700 |
commit | 55660072db3bb05d1daba0eb67865913b82d313a (patch) | |
tree | bbeda328257b0960f227c5509224077c7cf9c158 /oldXMenu/InsPane.c | |
parent | aefd87e148d11777492fc068f3eddf2945cfbfc5 (diff) |
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/InsPane.c')
-rw-r--r-- | oldXMenu/InsPane.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c index c1993f5bfd..bdbadbf122 100644 --- a/oldXMenu/InsPane.c +++ b/oldXMenu/InsPane.c @@ -26,7 +26,7 @@ XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ { register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *pane; /* Newly created pane. */ - register XMSelect *select; /* Initial selection for the new pane. */ + register XMSelect *sel; /* Initial selection for the new pane. */ int label_length; /* Label length in characters. */ int label_width; /* Label width in pixels. */ @@ -54,8 +54,8 @@ XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ _XMErrorCode = XME_CALLOC; return(XM_FAILURE); } - select = (XMSelect *)calloc(1, sizeof(XMSelect)); - if (select == NULL) { + sel = (XMSelect *)calloc(1, sizeof(XMSelect)); + if (sel == NULL) { _XMErrorCode = XME_CALLOC; return(XM_FAILURE); } @@ -70,11 +70,11 @@ XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ * Set up the initial selection. * Values not explicitly set are zeroed by calloc. */ - select->next = select; - select->prev = select; - select->type = SL_HEADER; - select->serial = -1; - select->parent_p = pane; + sel->next = sel; + sel->prev = sel; + sel->type = SL_HEADER; + sel->serial = -1; + sel->parent_p = pane; /* * Fill the XMPane structure. @@ -85,7 +85,7 @@ XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ pane->label = label; pane->label_width = label_width; pane->label_length = label_length; - pane->s_list = select; + pane->s_list = sel; /* * Insert the pane after the pane with the pane @@ -110,4 +110,3 @@ XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ _XMErrorCode = XME_NO_ERROR; return(p_num); } - |