X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/61e1e4e80a50c832ded32458212235dd84837635..4889fc82cf51dacb7435e33c5230f53c1251b0d4:/oldXMenu/XMakeAssoc.c

diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index 443c1f447e..3626eb01f5 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <config.h>
 #include <X11/Xlib.h>
@@ -24,25 +13,21 @@ without express or implied warranty.
 #define NULL 0
 #endif
 
-extern int errno;
-
-void emacs_insque();
 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
  * meaningless (but cause no problems).  The queue in each association
  * bucket is sorted (lowest XId to highest XId).
  */
-XMakeAssoc(dpy, table, x_id, data)
-	register Display *dpy;
-	register XAssocTable *table;
-	register XID x_id;
-	register caddr_t data;
+void
+XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data)
 {
 	int hash;
 	register XAssoc *bucket;
@@ -92,7 +77,7 @@ XMakeAssoc(dpy, table, x_id, data)
 	/* If we are here then the new entry should be inserted just */
 	/* before the current value of "Entry". */
 	/* Create a new XAssoc and load it with new provided data. */
-	new_entry = (XAssoc *) xmalloc(sizeof(XAssoc));
+	new_entry = (XAssoc *) malloc(sizeof(XAssoc));
 	new_entry->display = dpy;
 	new_entry->x_id = x_id;
 	new_entry->data = data;
@@ -101,5 +86,3 @@ XMakeAssoc(dpy, table, x_id, data)
 	emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev);
 }
 
-/* arch-tag: d7e3fb8a-f3b3-4c5d-a307-75ca67ec1b49
-   (do not change this comment) */