if (prev) {
prev->next = b->next;
b->next = NULL;
- rfc822_free_address (&b);
+ address_delete (&b);
b = prev;
}
else {
top = top->next;
b->next = NULL;
- rfc822_free_address (&b);
+ address_delete (&b);
b = top;
}
}
a = a->next;
if (!leave_only || a || last) {
tmp->next = NULL;
- rfc822_free_address (&tmp);
+ address_delete (&tmp);
}
else
last = top = tmp;
rfc822_write_address (buf, sizeof (buf), *a, 0);
if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0)
return (-1);
- rfc822_free_address (a);
+ address_delete (a);
*a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf));
if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) {
mutt_error (_("Error: '%s' is a bad IDN."), err);
for (; uh; uh = uh->next) {
if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
/* User has specified a default From: address. Remove default address */
- rfc822_free_address (&env->from);
+ address_delete (&env->from);
env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
}
else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
- rfc822_free_address (&env->reply_to);
+ address_delete (&env->reply_to);
env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
}
else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
case M_YES:
tmp = find_mailing_lists (env->to, env->cc);
rfc822_append (to, tmp);
- rfc822_free_address (&tmp);
+ address_delete (&tmp);
return 0;
case -1:
return -1; /* abort */
if (flags & SENDLISTREPLY) {
tmp = find_mailing_lists (in->to, in->cc);
rfc822_append (&out->to, tmp);
- rfc822_free_address (&tmp);
+ address_delete (&tmp);
if (in->mail_followup_to && hmfupto == M_YES &&
default_to (&out->cc, in, flags & SENDLISTREPLY, hmfupto) == -1)
if (From)
adr = rfc822_cpy_adr_real (From);
else if (option (OPTUSEDOMAIN)) {
- adr = rfc822_new_address ();
+ adr = address_new ();
adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
- adr = rfc822_new_address ();
+ adr = address_new ();
adr->mailbox = m_strdup(NONULL (Username));
}
/* Use any list-post header as a template */
url_parse_mailto (msg->env, NULL, cur->env->list_post);
/* We don't let them set the sender's address. */
- rfc822_free_address (&msg->env->from);
+ address_delete (&msg->env->from);
}
if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
msg->replied = 0;
if (killfrom) {
- rfc822_free_address (&msg->env->from);
+ address_delete (&msg->env->from);
killfrom = 0;
}
}
mutt_select_fcc (fcc, sizeof (fcc), msg);
if (killfrom) {
- rfc822_free_address (&msg->env->from);
+ address_delete (&msg->env->from);
killfrom = 0;
}
}