Command line printer manipulation client, and build goo.

[moira.git] / lib / hash.c

diff --git a/lib/hash.c b/lib/hash.c
index 214eae4caad54b1348bad1828f0ca1912cf0d424..c0c19d8eed8a84cf969b64d6d7a08b975623e0e7 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,21 +1,20 @@
-/* $Header$
+/* $Id$
  *
  * Generic hash table routines.  Uses integer keys to store char * values.
  *
- *  (c) Copyright 1988 by the Massachusetts Institute of Technology.
- *  For copying and distribution information, please see the file
- *  <mit-copyright.h>.
+ * Copyright (C) 1988-1998 by the Massachusetts Institute of Technology.
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
 #include <mit-copyright.h>
-#include <ctype.h>
 #include <moira.h>
-#include <string.h>
+
 #include <stdlib.h>
+#include <string.h>
+
+RCSID("$Header$");
 
-#ifndef NULL
-#define NULL 0
-#endif
 #define hash_func(h, key) (key >= 0 ? (key % h->size) : (-key % h->size))
 
 /* Create a hash table.  The size is just a hint, not a maximum. */
@@ -28,13 +27,13 @@ struct hash *create_hash(int size)
   if (!h)
     return NULL;
   h->size = size;
-  h->data = malloc(size * sizeof(char *));
+  h->data = malloc(size * sizeof(void *));
   if (!h->data)
     {
       free(h);
       return NULL;
     }
-  memset(h->data, 0, size * sizeof(char *));
+  memset(h->data, 0, size * sizeof(void *));
   return h;
 }
 
@@ -42,9 +41,9 @@ struct hash *create_hash(int size)
  * the key, or NULL (thus NULL is not a very good value to store...)
  */
 
-char *hash_lookup(struct hash *h, register int key)
+void *hash_lookup(struct hash *h, int key)
 {
-  register struct bucket *b;
+  struct bucket *b;
 
   b = h->data[hash_func(h, key)];
   while (b && b->key != key)
@@ -60,9 +59,9 @@ char *hash_lookup(struct hash *h, register int key)
  * existed, or 0 if not.
  */
 
-int hash_update(struct hash *h, register int key, char *value)
+int hash_update(struct hash *h, int key, void *value)
 {
-  register struct bucket *b;
+  struct bucket *b;
 
   b = h->data[hash_func(h, key)];
   while (b && b->key != key)
@@ -81,9 +80,9 @@ int hash_update(struct hash *h, register int key, char *value)
  * there, 1 if it was, or -1 if we ran out of memory.
  */
 
-int hash_store(struct hash *h, register int key, char *value)
+int hash_store(struct hash *h, int key, void *value)
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   p = &(h->data[hash_func(h, key)]);
   if (!*p)
@@ -118,9 +117,9 @@ int hash_store(struct hash *h, register int key, char *value)
  * data with that value, call the callback proc with the corresponding key.
  */
 
-hash_search(struct hash *h, register char *value, void (*callback)())
+void hash_search(struct hash *h, void *value, void (*callback)(int))
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -136,9 +135,10 @@ hash_search(struct hash *h, register char *value, void (*callback)())
 /* Step through the hash table, calling the callback proc with each key.
  */
 
-hash_step(struct hash *h, void (*callback)(), char *hint)
+void hash_step(struct hash *h, void (*callback)(int, void *, void *),
+              void *hint)
 {
-  register struct bucket *b, **p;
+  struct bucket *b, **p;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {
@@ -150,9 +150,9 @@ hash_step(struct hash *h, void (*callback)(), char *hint)
 
 /* Deallocate all of the memory associated with a table */
 
-hash_destroy(struct hash *h)
+void hash_destroy(struct hash *h)
 {
-  register struct bucket *b, **p, *b1;
+  struct bucket *b, **p, *b1;
 
   for (p = &(h->data[h->size - 1]); p >= h->data; p--)
     {