X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgp.c;h=4603a94a25450937d7d356260624bf42a634d837;hp=13a5e1e25b299ab9e0ca81664b6c99b2409d16b0;hb=8e037c67a88cb4680c4391134c578e3b55a80f8a;hpb=13b3b36c8f696aea26b7c60444f2baa4858b004d diff --git a/pgp.c b/pgp.c index 13a5e1e..4603a94 100644 --- a/pgp.c +++ b/pgp.c @@ -21,6 +21,8 @@ # include "config.h" #endif +#include + #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); } - mem_free (&line); + p_delete(&line); } else { debug_print (2, ("No pattern.\n")); @@ -239,7 +241,7 @@ int pgp_application_pgp_handler (BODY * m, STATE * s) int clearsign = 0, rv, rc; long start_pos = 0; long bytes; - LOFF_T last_pos, offset; + off_t last_pos, offset; char buf[HUGE_STRING]; char outfile[_POSIX_PATH_MAX]; char tmpfname[_POSIX_PATH_MAX]; @@ -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) { - mem_free (&keylist); + p_delete(&keylist); 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) { - mem_free (&keylist); + p_delete(&keylist); rfc822_free_address (&tmp); rfc822_free_address (&addr); return NULL;