err:
mx_close_message (&msg);
envelope_delete(&newhdr->env);
- mutt_free_body (&newhdr->content);
+ body_list_wipe(&newhdr->content);
mutt_error _("Decryption failed.");
return -1;
}
- mutt_free_body (&newhdr->content);
+ body_list_wipe(&newhdr->content);
newhdr->content = b;
mutt_clear_error ();
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
- mutt_free_body (&newhdr->content->parts->next);
+ body_list_wipe(&newhdr->content->parts->next);
newhdr->content = mutt_remove_multipart (newhdr->content);
}
b->noconv = 0;
}
- mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
+ parameter_delval(&b->parameter, "x-mutt-noconv");
}
mutt_adv_mktemp (NULL, file, sizeof (file));
b->type = TYPETEXT;
m_strreplace(&b->subtype, "plain");
- mutt_delete_parameter ("x-action", &b->parameter);
+ parameter_delval(&b->parameter, "x-action");
}
else
mutt_decode_attachment (b, &s);
mutt_stamp_attachment (b);
- mutt_free_body (&b->parts);
+ body_list_wipe(&b->parts);
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
if (rv == -1) {
envelope_delete(&newhdr->env);
- mutt_free_body (&newhdr->content);
+ body_list_wipe(&newhdr->content);
}
return rv;