context_find.c: Hoist strlen(3) out of search loop.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 19fbdcc6d253675e94f227cbb47c8f35306faa7f..597569b517090d498bb7730baf3769498a703354 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -11,16 +11,16 @@ extern const char plurals[];
 #define PLURALS(n) (plurals + ((n) == 1))
 
 /* Call malloc(3), exiting on NULL return. */
 #define PLURALS(n) (plurals + ((n) == 1))
 
 /* Call malloc(3), exiting on NULL return. */

-void *mh_xmalloc(size_t size);
+void *mh_xmalloc(size_t size) MALLOC ALLOC_SIZE(1);

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

-void *mh_xrealloc(void *ptr, size_t size);
+void *mh_xrealloc(void *ptr, size_t size) ALLOC_SIZE(2);

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

-void *mh_xcalloc(size_t nelem, size_t elsize);
+void *mh_xcalloc(size_t nelem, size_t elsize) MALLOC ALLOC_SIZE(1, 2);

 
 /* Duplicate a NUL-terminated string, exit on failure. */
 
 /* Duplicate a NUL-terminated string, exit on failure. */

-char *mh_xstrdup(const char *src);
+char *mh_xstrdup(const char *src) MALLOC;

 
 /* 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);


@@ -31,9 +31,12 @@ void mh_xfree(void *ptr);
 /* 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)))
 

+/* Zero the bytes to which p points. */
+#define ZERO(p) memset((p), 0, sizeof *(p))
+

 char *pwd(void);
 char *pwd(void);

-char *add(const char *, char *);
-char *addlist(char *, const char *);
+char *add(const char *, char *) MALLOC;
+char *addlist(char *, const char *) MALLOC;

 int folder_exists(const char *);
 void create_folder(char *, int, void (*)(int));
 int num_digits(int);
 int folder_exists(const char *);
 void create_folder(char *, int, void (*)(int));
 int num_digits(int);