X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1bd5129468527b24516a9efed711630a33e41a59..34f0ab116ad7734e96127d3cd046861a5c82c11c:/sbr/utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 83c32170..5b7b19f1 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -61,22 +61,26 @@ void *mh_xrealloc(void *ptr, size_t size)
     return new;
 }
 
-/*
- * Safely call calloc
- */
-void *
-mh_xcalloc(size_t nmemb, size_t size)
+/* Call calloc(3), exiting on NULL return. */
+void *mh_xcalloc(size_t nelem, size_t elsize)
 {
-    void *memory;
+    void *p;
 
-    if (nmemb == 0  ||  size == 0)
-        adios(NULL, "Tried to calloc 0 bytes");
+    if (!nelem || !elsize)
+        return mh_xmalloc(1); /* Get a unique pointer. */
 
-    if ((memory = calloc(nmemb, size))) {
-        return memory;
-    } else {
-        adios(NULL, "calloc failed");
-    }
+    p = calloc(nelem, elsize);
+    if (!p)
+        adios(NULL, "calloc failed, size wanted: %zu * %zu", nelem, elsize);
+
+    return p;
+}
+
+/* Call free(3), if ptr isn't NULL. */
+void mh_xfree(void *ptr)
+{
+    if (ptr)
+        free(ptr); /* Some very old platforms can't cope with NULL. */
 }
 
 /*