}
if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
- pbody = mutt_new_body ();
+ pbody = body_new();
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
if (save_sig) {
/* cleanup the second signature structures */
if (save_content->parts) {
- mutt_free_body (&save_content->parts->next);
+ body_list_wipe(&save_content->parts->next);
save_content->parts = NULL;
}
- mutt_free_body (&save_content);
+ body_list_wipe(&save_content);
/* restore old signature and attachments */
msg->content->parts->next = save_sig;
}
else if (save_content) {
/* destroy the new encrypted body. */
- mutt_free_body (&save_content);
+ body_list_wipe(&save_content);
}
}
if ((msg->security & ENCRYPT)
|| ((msg->security & SIGN)
&& msg->content->type == TYPEAPPLICATION)) {
- mutt_free_body (&msg->content); /* destroy PGP data */
+ body_list_wipe(&msg->content); /* destroy PGP data */
msg->content = clear_content; /* restore clear text. */
}
else if ((msg->security & SIGN) && msg->content->type == TYPEMULTIPART) {
- mutt_free_body (&msg->content->parts->next); /* destroy sig */
+ body_list_wipe(&msg->content->parts->next); /* destroy sig */
msg->content = mutt_remove_multipart (msg->content);
}
p_delete(&pgpkeylist);
if (free_clear_content)
- mutt_free_body (&clear_content);
+ body_list_wipe(&clear_content);
if (flags & SENDREPLY) {
if (cur && ctx)