mhlsbr.c: Don't strchr(3) non-string NUL-less buffer.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 8194f134754719a55e038ab6a4db615d142e0009..8debe1aaedb0f1f25be8bd5b96bd61f148bf7e32 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -12,6 +12,7 @@
 #include "makedir.h"
 #include <fcntl.h>
 #include <limits.h>
+#include "read_line.h"
 
 extern char *mhdocdir;
 
@@ -35,7 +36,7 @@ void *mh_xmalloc(size_t size)
         size = 1; /* Some mallocs don't like 0. */
     p = malloc(size);
     if (!p)
-        adios(NULL, "malloc failed, size wanted: %lu", (unsigned long)size);
+        adios(NULL, "malloc failed, size wanted: %zu", size);
 
     return p;
 }
@@ -47,7 +48,7 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     /* Copy POSIX behaviour, coping with non-POSIX systems. */
     if (size == 0) {
-        mh_xfree(ptr);
+        free(ptr);
         return mh_xmalloc(1); /* Get a unique pointer. */
     }
     if (!ptr)
@@ -55,7 +56,7 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     new = realloc(ptr, size);
     if (!new)
-        adios(NULL, "realloc failed, size wanted: %lu", (unsigned long)size);
+        adios(NULL, "realloc failed, size wanted: %zu", size);
 
     return new;
 }
@@ -70,8 +71,7 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 
     p = calloc(nelem, elsize);
     if (!p)
-        adios(NULL, "calloc failed, size wanted: %lu * %lu",
-            (unsigned long)nelem, (unsigned long)elsize);
+        adios(NULL, "calloc failed, size wanted: %zu * %zu", nelem, elsize);
 
     return p;
 }
@@ -89,13 +89,6 @@ char *mh_xstrdup(const char *src)
     return dest;
 }
 
-/* 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. */
-}
-
 /*
  * Return the present working directory, if the current directory does not
  * exist, or is too long, make / the pwd.