Improve POP SASL error handling

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index dd3fb431815e5b16e19f0bbdbeda2112e8d692c0..4df5e1565dac062f581b9f77ba166b1a41e53157 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -11,19 +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);
-
-/* Call free(3), if ptr isn't NULL. */
-void mh_xfree(void *ptr);
+char *mh_xstrdup(const char *src) MALLOC;

 
 /* Set p to point to newly allocated, uninitialised, memory. */
 #define NEW(p) ((p) = mh_xmalloc(sizeof *(p)))
 
 /* Set p to point to newly allocated, uninitialised, memory. */
 #define NEW(p) ((p) = mh_xmalloc(sizeof *(p)))


@@ -35,11 +32,11 @@ void mh_xfree(void *ptr);
 #define ZERO(p) memset((p), 0, sizeof *(p))
 
 char *pwd(void);
 #define ZERO(p) memset((p), 0, sizeof *(p))
 
 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 folder_exists(const char *);
 void create_folder(char *, int, void (*)(int));

-int num_digits(int);
+int num_digits(int) PURE;

 
 /*
  * A vector of char array, used to hold a list of string message numbers
 
 /*
  * A vector of char array, used to hold a list of string message numbers


@@ -68,17 +65,17 @@ struct msgnum_array {
 void app_msgarg(struct msgs_array *, char *);
 void app_msgnum(struct msgnum_array *, int);
 
 void app_msgarg(struct msgs_array *, char *);
 void app_msgnum(struct msgnum_array *, int);
 

-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 *find_str (const char [], size_t, const char *) PURE;
+char *rfind_str (const char [], size_t, const char *) PURE;
+char *nmh_strcasestr (const char *, const char *) PURE;

 
 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))
 
 
 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);
+bool has_prefix(const char *s, const char *prefix) PURE;
+bool has_suffix(const char *s, const char *suffix) PURE;
+bool has_suffix_c(const char *s, int c) PURE;

 void trim_suffix_c(char *s, int c);
 void to_lower(char *s);
 void to_upper(char *s);
 void trim_suffix_c(char *s, int c);
 void to_lower(char *s);
 void to_upper(char *s);


@@ -89,7 +86,7 @@ bool contains8bit(const char *start, const char *end);
  * See if file has any 8-bit bytes.
  * Arguments include:
  *
  * See if file has any 8-bit bytes.
  * Arguments include:
  *

- * fd          - file descriptor
+ * fd          - file descriptor

  * eightbit    - address of result, will be set to 1 if the file contains
  *                any 8-bit bytes, 0 otherwise.
  *
  * eightbit    - address of result, will be set to 1 if the file contains
  *                any 8-bit bytes, 0 otherwise.
  *


@@ -115,12 +112,10 @@ char *m_strn(int value, unsigned int width);
  * program initialization
  *
  * argv0        - argv[0], presumably the program name
  * program initialization
  *
  * argv0        - argv[0], presumably the program name

- * read_context - 0: don't read context
- *              - 1: read context, check nmh version, and issue warning message
- *                   if non-existent or old
- *              - 2: read context, don't check nmh version
+ * read_context - whether to read the context
+ * check_version - if read_context, whether to check the version, and issue warning message if non-existent or old

  */
  */

-int nmh_init(const char *argv0, int read_context);
+int nmh_init(const char *argv0, bool read_context, bool check_version);

 
 /*
  * Compares prior version of nmh with current version.  Returns 1
 
 /*
  * Compares prior version of nmh with current version.  Returns 1