Tweak mh_xrealloc(); print size on error, follow POSIX.

Using `%zu' for the size_t value.  That might be a problem on older
platforms, but we'll see.  If asked for zero bytes then free an existing
pointer, only passing it to free(3) if it's non-NULL, and then allocate
a byte so a unique pointer is returned.

diff --git a/h/utils.h b/h/utils.h
index 3a428193fb50618b4973fee1d68fd86dfeee2734..20ebd2cf1234b56abe91136a1f616340d6b090f6 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -6,7 +6,9 @@
 /* Call malloc(3), exiting on NULL return. */
 void *mh_xmalloc(size_t);
 
 /* Call malloc(3), exiting on NULL return. */
 void *mh_xmalloc(size_t);
 

+/* Call realloc(3), exiting on NULL return. */

 void *mh_xrealloc(void *, size_t);
 void *mh_xrealloc(void *, size_t);

+

 void *mh_xcalloc(size_t, size_t);
 char *pwd(void);
 char *add(const char *, char *);
 void *mh_xcalloc(size_t, size_t);
 char *pwd(void);
 char *add(const char *, char *);

diff --git a/sbr/utils.c b/sbr/utils.c
index d3228909549184e695a4f7857bb91ef2141e6040..83c32170223e91de2b6c773fc9cd920cc42b4e45 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -39,26 +39,26 @@ void *mh_xmalloc(size_t size)
     return p;
 }
 
     return p;
 }
 

-/*
- * Safely call realloc
- */
-void *
-mh_xrealloc(void *ptr, size_t size)
+/* Call realloc(3), exiting on NULL return. */
+void *mh_xrealloc(void *ptr, size_t size)

 {
 {

-    void *memory;
+    void *new;

 
 

-    /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
+    /* Copy POSIX behaviour, coping with non-POSIX systems. */
+    if (size == 0) {
+        if (ptr) {
+            free(ptr);
+        }
+        return mh_xmalloc(1); /* Get a unique pointer. */
+    }

     if (!ptr)
         return mh_xmalloc(size);
 
     if (!ptr)
         return mh_xmalloc(size);
 

-    if (size == 0)
-        adios(NULL, "Tried to realloc 0 bytes");
-
-    memory = realloc(ptr, size);
-    if (!memory)
-        adios(NULL, "Realloc failed");
+    new = realloc(ptr, size);
+    if (!new)
+        adios(NULL, "realloc failed, size wanted: %zu", size);

 
 

-    return memory;
+    return new;

 }
 
 /*
 }
 
 /*