mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-23 07:19:15 +00:00
55660072db
* 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.
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
/* Copyright Massachusetts Institute of Technology 1985 */
|
|
|
|
#include "copyright.h"
|
|
|
|
#include "XMenuInt.h"
|
|
|
|
/*
|
|
* XDeleteAssoc - Delete an association in an XAssocTable keyed on
|
|
* an XId. An association may be removed only once. Redundant
|
|
* deletes are meaningless (but cause no problems).
|
|
*/
|
|
void
|
|
XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
|
|
{
|
|
int hash;
|
|
register XAssoc *bucket;
|
|
register XAssoc *Entry;
|
|
|
|
/* Hash the XId to get the bucket number. */
|
|
hash = x_id & (table->size - 1);
|
|
/* Look up the bucket to get the entries in that bucket. */
|
|
bucket = &table->buckets[hash];
|
|
/* Get the first entry in the bucket. */
|
|
Entry = bucket->next;
|
|
|
|
/* Scan through the entries in the bucket for the right XId. */
|
|
for (; Entry != bucket; Entry = Entry->next) {
|
|
if (Entry->x_id == x_id) {
|
|
/* We have the right XId. */
|
|
if (Entry->display == dpy) {
|
|
/* We have the right display. */
|
|
/* We have the right entry! */
|
|
/* Remove it from the queue and */
|
|
/* free the entry. */
|
|
emacs_remque((struct qelem *)Entry);
|
|
free((char *)Entry);
|
|
return;
|
|
}
|
|
/* Oops, identical XId's on different displays! */
|
|
continue;
|
|
}
|
|
if (Entry->x_id > x_id) {
|
|
/* We have gone past where it should be. */
|
|
/* It is apparently not in the table. */
|
|
return;
|
|
}
|
|
}
|
|
/* It is apparently not in the table. */
|
|
return;
|
|
}
|