/* #include <moira.h> */
struct int_bucket {
- struct int_bucket *next;
- int key;
- int data;
+ struct int_bucket *next;
+ int key;
+ int data;
};
struct int_hash {
- int size;
- struct int_bucket **data;
+ int size;
+ struct int_bucket **data;
};
-#ifndef NULL
-#define NULL 0
-#endif
#define int_hash_func(h, key) (key >= 0 ? (key % h->size) : (-key % h->size))
/* Create an int_hash table. The size is just a hint, not a maximum. */
-struct int_hash *create_int_hash(size)
-int size;
+struct int_hash *create_int_hash(int size)
{
- struct int_hash *h;
-
- h = (struct int_hash *) malloc(sizeof(struct int_hash));
- if (h == (struct int_hash *) NULL)
- return((struct int_hash *) NULL);
- h->size = size;
- h->data = (struct int_bucket **) malloc(size * sizeof(char *));
- if (h->data == (struct int_bucket **) NULL) {
- free(h);
- return((struct int_hash *) NULL);
+ struct int_hash *h;
+
+ h = malloc(sizeof(struct int_hash));
+ if (!h)
+ return NULL;
+ h->size = size;
+ h->data = malloc(size * sizeof(struct int_bucket *));
+ if (!h->data)
+ {
+ free(h);
+ return NULL;
}
- memset(h->data, 0, size * sizeof(char *));
- return(h);
+ memset(h->data, 0, size * sizeof(char *));
+ return h;
}
-/* Lookup an object in the int_hash table. Returns the value associated with
+/* Look up an object in the int_hash table. Returns the value associated with
* the key, or NULL (thus NULL is not a very good value to store...)
*/
-int int_hash_lookup(h, key)
-struct int_hash *h;
-register int key;
+int int_hash_lookup(struct int_hash *h, register int key)
{
- register struct int_bucket *b;
-
- b = h->data[int_hash_func(h, key)];
- while (b && b->key != key)
- b = b->next;
- if (b && b->key == key)
- return(b->data);
- else
- return(0);
+ register struct int_bucket *b;
+
+ b = h->data[int_hash_func(h, key)];
+ while (b && b->key != key)
+ b = b->next;
+ if (b && b->key == key)
+ return b->data;
+ else
+ return 0;
}
* existed, or 0 if not.
*/
-int int_hash_update(h, key, value)
-struct int_hash *h;
-register int key;
-int value;
+int int_hash_update(struct int_hash *h, register int key, int value)
{
- register struct int_bucket *b;
-
- b = h->data[int_hash_func(h, key)];
- while (b && b->key != key)
- b = b->next;
- if (b && b->key == key) {
- b->data = value;
- return(1);
- } else
- return(0);
+ register struct int_bucket *b;
+
+ b = h->data[int_hash_func(h, key)];
+ while (b && b->key != key)
+ b = b->next;
+ if (b && b->key == key)
+ {
+ b->data = value;
+ return 1;
+ }
+ else
+ return 0;
}
-/* Store an item in the int_hash table. Returns 0 if the key was not previously
- * there, 1 if it was, or -1 if we ran out of memory.
+/* Store an item in the int_hash table. Returns 0 if the key was not
+ * previously there, 1 if it was, or -1 if we ran out of memory.
*/
-int int_hash_store(h, key, value)
-struct int_hash *h;
-register int key;
-int value;
+int int_hash_store(struct int_hash *h, register int key, int value)
{
- register struct int_bucket *b, **p;
-
- p = &(h->data[int_hash_func(h, key)]);
- if (*p == NULL) {
- b = *p = (struct int_bucket *) malloc(sizeof(struct int_bucket));
- if (b == (struct int_bucket *) NULL)
- return(-1);
- b->next = NULL;
- b->key = key;
- b->data = value;
- return(0);
+ register struct int_bucket *b, **p;
+
+ p = &(h->data[int_hash_func(h, key)]);
+ if (!*p)
+ {
+ b = *p = malloc(sizeof(struct int_bucket));
+ if (!b)
+ return -1;
+ b->next = NULL;
+ b->key = key;
+ b->data = value;
+ return 0;
}
- for (b = *p; b && b->key != key; b = *p)
- p = (struct int_bucket **) *p;
- if (b && b->key == key) {
- b->data = value;
- return(1);
+ for (b = *p; b && b->key != key; b = *p)
+ p = (struct int_bucket **) *p;
+ if (b && b->key == key)
+ {
+ b->data = value;
+ return 1;
}
- b = *p = (struct int_bucket *) malloc(sizeof(struct int_bucket));
- if (b == (struct int_bucket *) NULL)
- return(-1);
- b->next = NULL;
- b->key = key;
- b->data = value;
- return(0);
+ b = *p = malloc(sizeof(struct int_bucket));
+ if (!b)
+ return -1;
+ b->next = NULL;
+ b->key = key;
+ b->data = value;
+ return 0;
}
* data with that value, call the callback proc with the corresponding key.
*/
-int_hash_search(h, value, callback)
-struct int_hash *h;
-register int value;
-void (*callback)();
+int int_hash_search(struct int_hash *h, register int value, void (*callback)())
{
- register struct int_bucket *b, **p;
-
- for (p = &(h->data[h->size - 1]); p >= h->data; p--) {
- for (b = *p; b; b = b->next) {
- if (b->data == value)
- (*callback)(b->key);
+ register struct int_bucket *b, **p;
+
+ for (p = &(h->data[h->size - 1]); p >= h->data; p--)
+ {
+ for (b = *p; b; b = b->next)
+ {
+ if (b->data == value)
+ (*callback)(b->key);
}
}
}
/* Step through the int_hash table, calling the callback proc with each key.
*/
-int_hash_step(h, callback, hint)
-struct int_hash *h;
-void (*callback)();
-char *hint;
+int int_hash_step(struct int_hash *h, void (*callback)(), char *hint)
{
- register struct int_bucket *b, **p;
+ register struct int_bucket *b, **p;
- for (p = &(h->data[h->size - 1]); p >= h->data; p--) {
- for (b = *p; b; b = b->next) {
- (*callback)(b->key, b->data, hint);
- }
+ for (p = &(h->data[h->size - 1]); p >= h->data; p--)
+ {
+ for (b = *p; b; b = b->next)
+ (*callback)(b->key, b->data, hint);
}
}
/* Deallocate all of the memory associated with a table */
-int_hash_destroy(h)
-struct int_hash *h;
+int int_hash_destroy(struct int_hash *h)
{
- register struct int_bucket *b, **p, *b1;
-
- for (p = &(h->data[h->size - 1]); p >= h->data; p--) {
- for (b = *p; b; b = b1) {
- b1 = b->next;
- free(b);
+ register struct int_bucket *b, **p, *b1;
+
+ for (p = &(h->data[h->size - 1]); p >= h->data; p--)
+ {
+ for (b = *p; b; b = b1)
+ {
+ b1 = b->next;
+ free(b);
}
}
}
andersk / moira.git / blobdiff