catch out of memory error conditions in list and hash functions

Author: drscholl

hash.c

@@ -22,8 +22,15 @@ HASH *
 hash_init (int buckets, hash_destroy f)
 {
     HASH *h = CALLOC (1, sizeof (HASH));
+
+    if (!h)
+	return 0;
     h->numbuckets = buckets;
-    h->bucket = CALLOC (buckets, sizeof (HASHENT *));
+    if ((h->bucket = CALLOC (buckets, sizeof (HASHENT *))) == 0)
+    {
+	FREE (h);
+	return 0;
+    }
     h->destroy = f;
     return h;
 }
@@ -32,7 +39,9 @@ static unsigned int
 hash_string (HASH * table, const char *key)
 {
     unsigned int sum = 0;
-    for (;*key;key++)
+
+    ASSERT (key != 0);
+    for (; *key; key++)
     {
 	/* shifting by 1 bit prevents abc from having the same hash as acb */
 	sum<<=1;
@@ -42,18 +51,24 @@ hash_string (HASH * table, const char *key)
     return sum;
 }
 
-void
+int
 hash_add (HASH * table, const char *key, void *data)
 {
     HASHENT *he = CALLOC (1, sizeof (HASHENT));
     unsigned int sum;
 
+    if (!he)
+	return -1;
+    ASSERT (key != 0);
+    ASSERT (data  != 0);
+    ASSERT (table != 0);
     he->key = key;
     he->data = data;
     sum = hash_string (table, key);
     he->next = table->bucket[sum];
     table->bucket[sum] = he;
     table->dbsize++;
+    return 0;
 }
 
 void *
@@ -62,38 +77,38 @@ hash_lookup (HASH * table, const char *key)
     HASHENT *he;
     unsigned int sum = hash_string (table, key);
     he = table->bucket[sum];
-    while (he)
+
+    for (; he; he = he->next)
     {
 	if (strcasecmp (key, he->key) == 0)
 	    return he->data;
-	he = he->next;
     }
     return 0;
 }
 
-void
+int
 hash_remove (HASH * table, const char *key)
 {
-    HASHENT *he, *last = 0;
-    unsigned int sum = hash_string (table, key);
-    he = table->bucket[sum];
-    while (he)
+    HASHENT **he, *ptr;
+    unsigned int sum;
+    
+    ASSERT (table != 0);
+    ASSERT (key != 0);
+    sum = hash_string (table, key);
+    for (he = &table->bucket[sum]; *he; he = &(*he)->next)
     {
-	if (strcasecmp (key, he->key) == 0)
+	if (!strcasecmp (key, (*he)->key))
 	{
-	    if (last)
-		last->next = he->next;
-	    else
-		table->bucket[sum] = he->next;
+	    ptr = (*he)->next;
 	    if (table->destroy)
-		table->destroy (he->data);
-	    FREE (he);
+		table->destroy ((*he)->data);
+	    FREE (*he);
 	    table->dbsize--;
-	    break;
+	    *he = ptr;
+	    return 0;
 	}
-	last = he;
-	he = he->next;
     }
+    return -1;
 }
 
 void
@@ -102,6 +117,7 @@ free_hash (HASH * h)
     HASHENT *he, *ptr;
     int i;
 
+    ASSERT (h != 0);
     /* destroy remaining entries */
     for (i = 0; i < h->numbuckets; i++)
     {

hash.h

@@ -31,9 +31,9 @@ HASH;
 typedef void (*hash_callback_t) (void *, void *);
 
 HASH *hash_init (int, hash_destroy);
-void hash_add (HASH *, const char *, void *);
+int hash_add (HASH *, const char *, void *);
 void *hash_lookup (HASH *, const char *);
-void hash_remove (HASH *, const char *);
+int hash_remove (HASH *, const char *);
 void free_hash (HASH *);
 void hash_foreach (HASH *h, hash_callback_t, void *funcdata);
 

list.c

@@ -5,18 +5,18 @@
    $Id$ */
 
 #include <stdlib.h>
-#include <stdio.h>
 #include "list.h"
 #include "debug.h"
 
 LIST *
 list_new (void *data)
 {
     LIST *ptr = CALLOC (1, sizeof (LIST));
+
+    ASSERT (data != 0);
+    ASSERT (ptr != 0);
     if (ptr)
 	ptr->data = data;
-    else
-	fprintf (stderr, "list_new(): OUT OF MEMORY");
     return ptr;
 }
 
@@ -38,6 +38,8 @@ list_delete (LIST *list, void *data)
 {
     LIST **ptr;
 
+    ASSERT (list != 0);
+    ASSERT (data != 0);
     for (ptr = &list; *ptr; ptr = &(*ptr)->next)
     {
 	if ((*ptr)->data == data)
@@ -54,20 +56,18 @@ list_append (LIST * l, void *data)
 {
     LIST *r = l;
 
+    ASSERT (data != 0);
     if (!l)
     {
-        l = r = list_new (data);
-	if (!r)
-	    return 0;
+        r = list_new (data);
+	ASSERT (r != 0);
     }
     else
     {
         while (l->next)
             l = l->next;
         l->next = list_new (data);
-	if (!l->next)
-	    return r;
-        l = l->next;
+	ASSERT (l->next != 0);
     }
     return r;
 }

opennap.h

@@ -630,6 +630,12 @@ typedef unsigned int socklen_t;
 // see snprintf.c
 extern int snprintf (char *str,size_t count,const char *fmt,...);
 extern int vsnprintf (char *str, size_t count, const char *fmt, va_list args);
+extern int _getopt (int, char **, char *);
+
+#define getopt _getopt
+
+extern char *optarg;
+extern int optind;
 
 #endif /* !WIN32 */