Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 6a99466cb056cef20fa80cdb60788ba170910596..939bd80eabe200c28503edc254ccdf0a9f346349 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 *);
@@ -51,6 +63,17 @@ char *find_str (const char [], size_t, const char *);
 char *rfind_str (const char [], size_t, const char *);
 char *nmh_strcasestr (const char *, const char *);
 
+void trunccpy(char *dst, const char *src, size_t size);
+/* A convenience for the common case of dst being an array. */
+#define TRUNCCPY(dst, src) trunccpy(dst, src, sizeof (dst))
+
+bool HasPrefix(const char *s, const char *prefix);
+bool HasSuffix(const char *s, const char *suffix);
+bool HasSuffixC(const char *s, int c);
+void TrimSuffixC(char *s, int c);
+void ToLower(char *s);
+void ToUpper(char *s);
+
 /*
  * See if a string contains 8 bit characters (use isascii() for the test).
  * Arguments include: