projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make address functions a lot better, and less error prone.
[apps/madmutt.git]
/
smime.c
diff --git
a/smime.c
b/smime.c
index
1bad22a
..
1e173f6
100644
(file)
--- a/
smime.c
+++ b/
smime.c
@@
-721,7
+721,7
@@
void smime_getkeys (ENVELOPE * env)
}
if (!found && (t = mutt_default_from ())) {
_smime_getkeys (t->mailbox);
}
if (!found && (t = mutt_default_from ())) {
_smime_getkeys (t->mailbox);
-
rfc822_free_address
(&t);
+
address_delete
(&t);
}
}
}
}
@@
-756,7
+756,7
@@
char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
abort ();
}
abort ();
}
- *last =
rfc822_cpy_adr
(p);
+ *last =
address_list_dup
(p);
while (*last)
last = &((*last)->next);
}
while (*last)
last = &((*last)->next);
}
@@
-778,8
+778,8
@@
char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
if (!keyID) {
mutt_message (_("No (valid) certificate found for %s."), q->mailbox);
p_delete(&keylist);
if (!keyID) {
mutt_message (_("No (valid) certificate found for %s."), q->mailbox);
p_delete(&keylist);
-
rfc822_free_address
(&tmp);
-
rfc822_free_address
(&addr);
+
address_delete
(&tmp);
+
address_delete
(&addr);
return NULL;
}
return NULL;
}
@@
-788,10
+788,10
@@
char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
keylist_used = m_strlen(keylist);
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
keylist_used = m_strlen(keylist);
-
rfc822_free_address
(&addr);
+
address_delete
(&addr);
}
}
-
rfc822_free_address
(&tmp);
+
address_delete
(&tmp);
return (keylist);
}
return (keylist);
}