From: Richard Russon Date: Tue, 20 Aug 2019 20:45:41 +0000 (+0100) Subject: rename ParameterList variables X-Git-Tag: 2019-10-25~91^2~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b42b1419f399ceec2df9a6344bd338d53a11c304;p=neomutt rename ParameterList variables For consistency, call ParameterLists `pl`. --- diff --git a/email/parse.c b/email/parse.c index 9a393cffa..28e4ebdad 100644 --- a/email/parse.c +++ b/email/parse.c @@ -95,7 +95,7 @@ void mutt_auto_subscribe(const char *mailto) /** * parse_parameters - Parse a list of Parameters - * @param param Parameter list for the results + * @param pl Parameter list for the results * @param s String to parse * @param allow_value_spaces Allow values with spaces * @@ -104,7 +104,7 @@ void mutt_auto_subscribe(const char *mailto) * The allow_value_spaces parameter allows parsing those values which * are split by spaces when unfolded. */ -static void parse_parameters(struct ParameterList *param, const char *s, bool allow_value_spaces) +static void parse_parameters(struct ParameterList *pl, const char *s, bool allow_value_spaces) { struct Parameter *pnew = NULL; const char *p = NULL; @@ -207,7 +207,7 @@ static void parse_parameters(struct ParameterList *param, const char *s, bool al pnew->attribute ? pnew->attribute : "", pnew->value ? pnew->value : ""); /* Add this parameter to the list */ - TAILQ_INSERT_HEAD(param, pnew, entries); + TAILQ_INSERT_HEAD(pl, pnew, entries); } } else @@ -229,7 +229,7 @@ static void parse_parameters(struct ParameterList *param, const char *s, bool al bail: - rfc2231_decode_parameters(param); + rfc2231_decode_parameters(pl); mutt_buffer_pool_release(&buf); } @@ -242,8 +242,8 @@ bail: */ static void parse_content_disposition(const char *s, struct Body *ct) { - struct ParameterList parms; - TAILQ_INIT(&parms); + struct ParameterList pl; + TAILQ_INIT(&pl); if (mutt_str_startswith(s, "inline", CASE_IGNORE)) ct->disposition = DISP_INLINE; @@ -257,14 +257,14 @@ static void parse_content_disposition(const char *s, struct Body *ct) if (s) { s = mutt_str_skip_email_wsp(s + 1); - parse_parameters(&parms, s, false); - s = mutt_param_get(&parms, "filename"); + parse_parameters(&pl, s, false); + s = mutt_param_get(&pl, "filename"); if (s) mutt_str_replace(&ct->filename, s); - s = mutt_param_get(&parms, "name"); + s = mutt_param_get(&pl, "name"); if (s) ct->form_name = mutt_str_strdup(s); - mutt_param_free(&parms); + mutt_param_free(&pl); } } diff --git a/email/rfc2231.c b/email/rfc2231.c index 03c3e733b..b6aad2af0 100644 --- a/email/rfc2231.c +++ b/email/rfc2231.c @@ -328,11 +328,11 @@ void rfc2231_decode_parameters(struct ParameterList *pl) */ struct ParameterList rfc2231_encode_string(const char *attribute, char *value) { - struct ParameterList result; - TAILQ_INIT(&result); + struct ParameterList pl; + TAILQ_INIT(&pl); if (!attribute || !value) - return result; + return pl; bool encode = false; bool add_quotes = false; @@ -429,7 +429,7 @@ struct ParameterList rfc2231_encode_string(const char *attribute, char *value) while (*cur) { current = mutt_param_new(); - TAILQ_INSERT_TAIL(&result, current, entries); + TAILQ_INSERT_TAIL(&pl, current, entries); mutt_buffer_strcpy(cur_attribute, attribute); if (split) @@ -478,5 +478,5 @@ struct ParameterList rfc2231_encode_string(const char *attribute, char *value) if (free_src_value) FREE(&src_value); - return result; + return pl; } diff --git a/sendlib.c b/sendlib.c index ac281e7f4..b2d68ac90 100644 --- a/sendlib.c +++ b/sendlib.c @@ -380,9 +380,9 @@ int mutt_write_mime_header(struct Body *a, FILE *fp) if (!np->attribute || !np->value) continue; - struct ParameterList param_conts = rfc2231_encode_string(np->attribute, np->value); + struct ParameterList pl_conts = rfc2231_encode_string(np->attribute, np->value); struct Parameter *cont = NULL; - TAILQ_FOREACH(cont, ¶m_conts, entries) + TAILQ_FOREACH(cont, &pl_conts, entries) { fputc(';', fp); @@ -412,7 +412,7 @@ int mutt_write_mime_header(struct Body *a, FILE *fp) fprintf(fp, "%s=%s", cont->attribute, buf); } - mutt_param_free(¶m_conts); + mutt_param_free(&pl_conts); } } @@ -448,9 +448,9 @@ int mutt_write_mime_header(struct Body *a, FILE *fp) else t = fn; - struct ParameterList param_conts = rfc2231_encode_string("filename", t); + struct ParameterList pl_conts = rfc2231_encode_string("filename", t); struct Parameter *cont = NULL; - TAILQ_FOREACH(cont, ¶m_conts, entries) + TAILQ_FOREACH(cont, &pl_conts, entries) { fputc(';', fp); buf[0] = 0; @@ -471,7 +471,7 @@ int mutt_write_mime_header(struct Body *a, FILE *fp) fprintf(fp, "%s=%s", cont->attribute, buf); } - mutt_param_free(¶m_conts); + mutt_param_free(&pl_conts); } } @@ -599,15 +599,15 @@ int mutt_write_mime_body(struct Body *a, FILE *fp) /** * mutt_generate_boundary - Create a unique boundary id for a MIME part - * @param parm MIME part + * @param pl MIME part */ -void mutt_generate_boundary(struct ParameterList *parm) +void mutt_generate_boundary(struct ParameterList *pl) { char rs[MUTT_RANDTAG_LEN + 1]; mutt_rand_base32(rs, sizeof(rs) - 1); rs[MUTT_RANDTAG_LEN] = 0; - mutt_param_set(parm, "boundary", rs); + mutt_param_set(pl, "boundary", rs); } /** diff --git a/sendlib.h b/sendlib.h index 0f0f116fe..7b0a26bef 100644 --- a/sendlib.h +++ b/sendlib.h @@ -66,7 +66,7 @@ enum MuttWriteHeaderMode char * mutt_body_get_charset(struct Body *b, char *buf, size_t buflen); int mutt_bounce_message(FILE *fp, struct Email *e, struct AddressList *to); const char * mutt_fqdn(bool may_hide_host); -void mutt_generate_boundary(struct ParameterList *parm); +void mutt_generate_boundary(struct ParameterList *pl); struct Content *mutt_get_content_info(const char *fname, struct Body *b); int mutt_invoke_sendmail(struct AddressList *from, struct AddressList *to, struct AddressList *cc, struct AddressList *bcc, const char *msg, int eightbit); enum ContentType mutt_lookup_mime_type(struct Body *att, const char *path);