projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop mem_alloc and mem_free, use my own hand crafted optmized macros that
[apps/madmutt.git]
/
pgp.c
diff --git
a/pgp.c
b/pgp.c
index
da199ce
..
4603a94
100644
(file)
--- a/
pgp.c
+++ b/
pgp.c
@@
-21,6
+21,8
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "enter.h"
#include "ascii.h"
#include "mutt.h"
#include "enter.h"
#include "ascii.h"
@@
-161,7
+163,7
@@
static int pgp_copy_checksig (FILE * fpin, FILE * fpout)
fputs (line, fpout);
fputc ('\n', fpout);
}
fputs (line, fpout);
fputc ('\n', fpout);
}
-
mem_free
(&line);
+
p_delete
(&line);
}
else {
debug_print (2, ("No pattern.\n"));
}
else {
debug_print (2, ("No pattern.\n"));
@@
-1142,7
+1144,7
@@
char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING);
}
else if (r == -1) {
k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING);
}
else if (r == -1) {
-
mem_free
(&keylist);
+
p_delete
(&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
@@
-1159,7
+1161,7
@@
char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
if ((key = pgp_ask_for_key (buf, q->mailbox,
KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
if ((key = pgp_ask_for_key (buf, q->mailbox,
KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
-
mem_free
(&keylist);
+
p_delete
(&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;