Coding style adjustments for nmh-imported code

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index e6e7dc1..8575b22 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -39,6 +39,7 @@ void cpydata(int, int, char *, char *);
 void cpydgst(int, int, char *, char *);
 int decode_rfc2047(char *, char *, size_t);
 int default_done(int);
+int encode_rfc2047(const char *name, char **value, const char *charset);
 int execprog(char *, char **);
 int execprogl(char *, char *, ...);
 char *expandfol(char *);
@@ -73,6 +74,7 @@ char *m_mktemp(const char *, int *, FILE **);
 char *m_mktemp2(const char *, const char *, int *, FILE **);
 void thisisanmbox(FILE *);
 int makedir(char *);
+int mh_strcasecmp(const char *s1, const char *s2);
 char *norm_charmap(char *);
 char *new_fs(char *, char *);
 int pidwait(pid_t, int);
@@ -108,28 +110,12 @@ char *toabsdir(char *);
 char *trim(unsigned char *);
 char *trimcpy(unsigned char *);
 int unputenv(char *);
+void unquote_string(const char *input, char *output);
 int uprf(char *, char *);
 int vfgets(FILE *, char **);
 char *write_charset_8bit(void);
 
-/*
- * Remove quotes and quoted-pair sequences from RFC-5322 atoms.
- *
- * Currently the actual algorithm is simpler than it technically should
- * be: any quotes are simply eaten, unless they're preceded by the escape
- * character (\).  This seems to be sufficient for our needs for now.
- *
- * Arguments:
- *
- * input       - The input string
- * output      - The output string; is assumed to have at least as much
- *               room as the input string.  At worst the output string will
- *               be the same size as the input string; it might be smaller.
- *
- */
-void unquote_string(const char *input, char *output);
 
-int mh_strcasecmp(const char *s1, const char *s2);
 
 
 /*
@@ -178,19 +164,3 @@ void set_readonly(struct msgs *);
 int other_files(struct msgs *);
 void set_other_files(struct msgs *);
 
-/*
- * Encode a message header using RFC 2047 encoding.  If the message contains
- * no non-ASCII characters, then leave the header as-is.
- *
- * Arguments include:
- *
- * name     - Message header name
- * value    - Message header content; must point to allocated memory
- *        (may be changed if encoding is necessary)
- * charset  - Charset used for encoding.  If NULL, obtain from system
- *        locale.
- *
- * Returns 0 on success, any other value on failure.
- */
-
-int encode_rfc2047(const char *name, char **value, const char *charset);