Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 6a99466cb056cef20fa80cdb60788ba170910596..9b659501bb6377234a1ca18d41affc4aa4a07ab7 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -4,13 +4,25 @@
  */
 
 /* Call malloc(3), exiting on NULL return. */
-void *mh_xmalloc(size_t);
+void *mh_xmalloc(size_t size);
 
 /* Call realloc(3), exiting on NULL return. */
-void *mh_xrealloc(void *, size_t);
+void *mh_xrealloc(void *ptr, size_t size);
 
 /* Call calloc(3), exiting on NULL return. */
-void *mh_xcalloc(size_t, size_t);
+void *mh_xcalloc(size_t nelem, size_t elsize);
+
+/* Duplicate a NUL-terminated string, exit on failure. */
+char *mh_xstrdup(const char *src);
+
+/* Call free(3), if ptr isn't NULL. */
+void mh_xfree(void *ptr);
+
+/* Set p to point to newly allocated, uninitialised, memory. */
+#define NEW(p) ((p) = mh_xmalloc(sizeof *(p)))
+
+/* Set p to point to newly allocated, zeroed, memory. */
+#define NEW0(p) ((p) = mh_xcalloc(1, sizeof *(p)))
 
 char *pwd(void);
 char *add(const char *, char *);