Don't `else' after return. Simplify control flow.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 7219143948c26c764124d7defaab5ac12e4c0841..db563cb4568f21b13a4b7b72d3b2a75b583c97db 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -12,9 +12,15 @@ void *mh_xrealloc(void *ptr, size_t size);
 /* Call calloc(3), exiting on NULL return. */
 void *mh_xcalloc(size_t nelem, size_t elsize);
 
 /* Call calloc(3), exiting on NULL return. */
 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);
 
 /* 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)))
 
 /* Set p to point to newly allocated, zeroed, memory. */
 #define NEW0(p) ((p) = mh_xcalloc(1, sizeof *(p)))
 


@@ -57,6 +63,9 @@ 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 *);
 
 char *rfind_str (const char [], size_t, const char *);
 char *nmh_strcasestr (const char *, const char *);
 

+bool EndsWithC(char *s, int c);
+void TrimSuffixC(char *s, int c);
+

 /*
  * See if a string contains 8 bit characters (use isascii() for the test).
  * Arguments include:
 /*
  * See if a string contains 8 bit characters (use isascii() for the test).
  * Arguments include: