* Ported some calloc() fixes to 1.2.9

svn: 2583

src/debug.c

@@ -114,7 +114,7 @@ void printstr(unsigned char *str, int len)
 	int max_strlen = 64;
         int xflag = 0;
 
-        outstr = (char *) calloc(1, 2 * max_strlen);
+        outstr = (char *) my_calloc(1, 2 * max_strlen);
         outend = outstr + max_strlen * 2 - 10;
 
         n = (((max_strlen) < (len)) ? (max_strlen) : (len));

src/hash_table.c

@@ -116,7 +116,7 @@ int hash_table_insert(hash_table_t *ht, const void *key, void *data)
 	row = ht->rows+idx;
 
 	/* Allocate an entry. */
-	entry = (hash_table_entry_t *) calloc(1, sizeof(*entry));
+	entry = (hash_table_entry_t *) my_calloc(1, sizeof(*entry));
 	entry->key = key;
 	entry->data = data;
 	entry->hash = hash;

src/set.c

@@ -561,7 +561,7 @@ static int var_add_list(const char *botnick, variable_t *var, const char *elemen
   if (olddata && osiz) {
     size_t esiz = strlen(element) + 1;		// element + ,
 
-    data = (char *) calloc(1, osiz + esiz + 1);
+    data = (char *) my_calloc(1, osiz + esiz + 1);
     simple_snprintf(data, osiz + esiz + 1, "%s,%s", olddata, element);
   } else /* otherwise, just set the data to the element to be added */
     data = strdup(element);
@@ -600,7 +600,7 @@ static char *var_rem_list(const char *botnick, variable_t *var, const char *elem
   olddata = olddatap = strdup(olddatacp);
   size_t osiz = strlen(olddata), esiz = strlen(element) + 1, tsiz = osiz - esiz + 1;          // element + ,
 
-  data = (char *) calloc(1, tsiz);
+  data = (char *) my_calloc(1, tsiz);
 
   while ((word = strsep(&olddata, delim))) {
     if ((num && num != i) || (!num && egg_strcasecmp(word, element))) {