projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oopsie
[apps/madmutt.git]
/
lib-mime
/
rfc822parse.c
diff --git
a/lib-mime/rfc822parse.c
b/lib-mime/rfc822parse.c
index
01e968a
..
33012fd
100644
(file)
--- a/
lib-mime/rfc822parse.c
+++ b/
lib-mime/rfc822parse.c
@@
-201,14
+201,14
@@
int mutt_check_mime_type(const char *s)
}
}
}
}
-static
PARAMETER
*parse_parameters(const char *s)
+static
parameter_t
*parse_parameters(const char *s)
{
{
-
PARAMETER
*res = NULL;
-
PARAMETER
**list = &res;
+
parameter_t
*res = NULL;
+
parameter_t
**list = &res;
while (*s) {
const char *p;
while (*s) {
const char *p;
-
PARAMETER
*new;
+
parameter_t
*new;
int i;
s = skipspaces(s);
int i;
s = skipspaces(s);
@@
-345,10
+345,10
@@
void mutt_parse_content_type(char *s, BODY *ct)
if (ct->type == TYPETEXT) {
pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
if (ct->type == TYPETEXT) {
pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
-
mutt_set_parameter(
"charset",
- option(OPTSTRICTMIME) ? "us-ascii" :
- charset_getfirst(AssumedCharset),
-
&ct->parameter
);
+
parameter_setval(&ct->parameter,
"charset",
+ option(OPTSTRICTMIME)
+ ? "us-ascii"
+
: charset_getfirst(AssumedCharset)
);
}
}
}
}
}
}
@@
-365,7
+365,7
@@
static void parse_content_disposition(const char *s, BODY *ct)
/* Check to see if a default filename was given */
if ((s = strchr (s, ';'))) {
/* Check to see if a default filename was given */
if ((s = strchr (s, ';'))) {
-
PARAMETER
*parms = parse_parameters(vskipspaces(s));
+
parameter_t
*parms = parse_parameters(vskipspaces(s));
if ((s = parameter_getval(parms, "filename")))
m_strreplace(&ct->filename, s);
if ((s = parameter_getval(parms, "filename")))
m_strreplace(&ct->filename, s);
@@
-384,7
+384,7
@@
static void parse_content_disposition(const char *s, BODY *ct)
*/
BODY *mutt_read_mime_header(FILE *fp, int digest)
{
*/
BODY *mutt_read_mime_header(FILE *fp, int digest)
{
- BODY *body =
mutt_new_body
();
+ BODY *body =
body_new
();
char *line = p_new(char, LONG_STRING);
ssize_t linelen = LONG_STRING;
char *p;
char *line = p_new(char, LONG_STRING);
ssize_t linelen = LONG_STRING;
char *p;
@@
-573,7
+573,7
@@
mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest)
*/
if (new->offset > end_off) {
*/
if (new->offset > end_off) {
-
mutt_free_body
(&new);
+
body_list_wipe
(&new);
break;
}
break;
}
@@
-1018,7
+1018,7
@@
mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
off_t loc;
if (hdr && !hdr->content) {
off_t loc;
if (hdr && !hdr->content) {
- hdr->content =
mutt_new_body
();
+ hdr->content =
body_new
();
/* set the defaults from RFC1521 */
hdr->content->type = TYPETEXT;
/* set the defaults from RFC1521 */
hdr->content->type = TYPETEXT;