Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 5252a0a060c26c4b4df61a3dfef2192b0af0d156..f06322b508c6ef0fdb91c3132a7dc7bb09d740db 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -167,7 +167,9 @@ char **getarguments (char *, int, char **, int);
  */
 char *get_charset(void);
 
  */
 char *get_charset(void);
 

-char *getcpy (const char *);
+/* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
+char *getcpy(const char *str);
+

 char *get_default_editor(void);
 char *getfolder(int);
 
 char *get_default_editor(void);
 char *getfolder(int);
 


@@ -479,14 +481,15 @@ int writeBase64 (const unsigned char *, size_t, unsigned char *);
 int writeBase64raw (const unsigned char *, size_t, unsigned char *);
 
 /*
 int writeBase64raw (const unsigned char *, size_t, unsigned char *);
 
 /*

- * first argument:  the string to be decoded
- * second argument:  the decoded bytes
- * third argument:  number of decoded bytes
- * fourth argument:   non-zero for text content, and for which CR's should be skipped
- * fifth argument:  for an MD5 digest, it can be null
+ * encoded      - the string to be decoded
+ * decoded      - the decoded bytes
+ * len          - number of decoded bytes
+ * skip-crs     - non-zero for text content, and for which CR's should be
+ *                skipped
+ * digest       - for an MD5 digest, it can be null

  */
  */

-int decodeBase64 (const char *, unsigned char **, size_t *, int,
-                 unsigned char *);
+int decodeBase64 (const char *encoded, unsigned char **decoded, size_t *len,
+                  int skip_crs, unsigned char *digest);

 
 void hexify (const unsigned char *, size_t, char **);
 
 
 void hexify (const unsigned char *, size_t, char **);
 


@@ -499,11 +502,11 @@ int nmh_get_credentials (char *, char *, int, nmh_creds_t);
 /*
  * program initialization
  *
 /*
  * 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
+ * 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

  */
 int nmh_init(const char *argv0, int read_context);
 
  */
 int nmh_init(const char *argv0, int read_context);