From: Ken Hornstein Date: Mon, 3 Mar 2014 05:43:46 +0000 (-0500) Subject: Make parse_header_attrs() a private function (there are no longer any X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/50d4d5ca6977bf7224f5ae0aa31f8ee7964df5a3?ds=sidebyside;hp=55deb9a8a3f78d67f5882d8e02bbaeab67c9078b Make parse_header_attrs() a private function (there are no longer any public consumers of it). --- diff --git a/h/mhparse.h b/h/mhparse.h index 16083816..ead187be 100644 --- a/h/mhparse.h +++ b/h/mhparse.h @@ -342,28 +342,6 @@ const struct str2init *get_ct_init (int); const char *ce_str (int); const struct str2init *get_ce_method (const char *); -/* - * Parse a series of MIME attributes (or parameters) given a header as - * input. - * - * Arguments include: - * - * filename - Name of input file (for error messages) - * fieldname - Name of field being processed - * headerp - Pointer to pointer of the beginning of the MIME attributes. - * Updated to point to end of attributes when finished. - * param_head - Pointer to head of parameter list - * param_tail - Pointer to tail of parameter list - * commentp - Pointer to header comment pointer (may be NULL) - * - * Returns OK if parsing was successful, NOTOK if parsing failed, and - * DONE to indicate a benign error (minor parsing error, but the program - * should continue). - */ -int parse_header_attrs (const char *filename, const char *fieldname, - char **headerp, PM *param_head, PM *param_tail, - char **commentp); - /* * Given a linked list of parameters, build an output string for them. This * string is designed to be concatenated on an already-built header. diff --git a/uip/mhparse.c b/uip/mhparse.c index dbe469c5..ebfd67d8 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -138,6 +138,8 @@ static int readDigest (CT, char *); static int get_leftover_mp_content (CT, int); static int InitURL (CT); static int openURL (CT, char **); +static int parse_header_attrs (const char *, const char *, char **, PM *, + PM *, char **); static size_t param_len(PM, int, size_t, int *, int *, size_t *); static size_t encode_param(PM, char *, size_t, size_t, size_t, int); static size_t normal_param(PM, char *, size_t, size_t, size_t); @@ -3224,7 +3226,26 @@ get_ce_method (const char *method) { return NULL; } -int +/* + * Parse a series of MIME attributes (or parameters) given a header as + * input. + * + * Arguments include: + * + * filename - Name of input file (for error messages) + * fieldname - Name of field being processed + * headerp - Pointer to pointer of the beginning of the MIME attributes. + * Updated to point to end of attributes when finished. + * param_head - Pointer to head of parameter list + * param_tail - Pointer to tail of parameter list + * commentp - Pointer to header comment pointer (may be NULL) + * + * Returns OK if parsing was successful, NOTOK if parsing failed, and + * DONE to indicate a benign error (minor parsing error, but the program + * should continue). + */ + +static int parse_header_attrs (const char *filename, const char *fieldname, char **header_attrp, PM *param_head, PM *param_tail, char **commentp)