Remove unneeded incomplete, member-less `struct tag;'.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 00249be447fd7670864768911b3d5d644b4f980b..c5991f42ed96c8dc47acc31212f446f847ec515d 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -1,11 +1,27 @@
-
-/*
- * utils.h -- utility prototypes
+/* utils.h -- utility prototypes

  */
 
  */
 

-void *mh_xmalloc(size_t);
-void *mh_xrealloc(void *, size_t);
-void *mh_xcalloc(size_t, size_t);
+/* Call malloc(3), exiting on NULL return. */
+void *mh_xmalloc(size_t size);
+
+/* Call realloc(3), exiting on NULL return. */
+void *mh_xrealloc(void *ptr, size_t size);
+
+/* 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);
+
+/* 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 *);
 char *addlist(char *, const char *);
 char *pwd(void);
 char *add(const char *, char *);
 char *addlist(char *, const char *);


@@ -45,6 +61,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 *);
 
 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 has_prefix(const char *s, const char *prefix);
+bool has_suffix(const char *s, const char *suffix);
+bool has_suffix_c(const char *s, int c);
+void trim_suffix_c(char *s, int c);
+void to_lower(char *s);
+void to_upper(char *s);
+

 /*
  * 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:


@@ -58,6 +85,20 @@ char *nmh_strcasestr (const char *, const char *);
  */
 int contains8bit(const char *start, const char *end);
 
  */
 int contains8bit(const char *start, const char *end);
 

+/*
+ * See if file has any 8-bit bytes.
+ * Arguments include:
+ *
+ * fd          - file descriptor
+ * eightbit    - address of result, will be set to 1 if the file contains
+ *                any 8-bit bytes, 0 otherwise.
+ *
+ * Returns OK on success, NOTOK on read failure.
+ *
+ */
+int scan_input (int fd, int *eightbit);
+
+

 /*
  * Compares prior version of nmh with current version.  Returns 1
  * if they compare the be the same, 0 if not.
 /*
  * Compares prior version of nmh with current version.  Returns 1
  * if they compare the be the same, 0 if not.