X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpinvoke.c;h=e22086e12fae00de8e5b0ac5f3e4e91887ad6423;hp=26d1d426d14b179dd9533efb060e6d5c25dcb8cd;hb=4670d23c56f21afaa7ef2e0289a47a6a0d112671;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 26d1d42..e22086e 100644
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -26,16 +26,17 @@
 #include <time.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "pgp.h"
-#include "rfc822.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 /*
@@ -161,7 +162,7 @@ static pid_t pgp_invoke (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
   struct pgp_command_context cctx;
   char cmd[HUGE_STRING];
 
-  memset (&cctx, 0, sizeof (cctx));
+  p_clear(&cctx, 1);
 
   if (!format || !*format)
     return (pid_t) - 1;
@@ -255,7 +256,7 @@ void pgp_invoke_import (const char *fname)
   char cmd[HUGE_STRING];
   struct pgp_command_context cctx;
 
-  memset (&cctx, 0, sizeof (cctx));
+  p_clear(&cctx, 1);
 
   mutt_quote_filename (_fname, sizeof (_fname), fname);
   cctx.fname = _fname;
@@ -264,7 +265,7 @@ void pgp_invoke_import (const char *fname)
   mutt_system (cmd);
 }
 
-void pgp_invoke_getkeys (ADDRESS * addr)
+void pgp_invoke_getkeys (address_t * addr)
 {
   char buff[LONG_STRING];
   char tmp[LONG_STRING];
@@ -278,7 +279,7 @@ void pgp_invoke_getkeys (ADDRESS * addr)
   if (!PgpGetkeysCommand)
     return;
 
-  memset (&cctx, 0, sizeof (cctx));
+  p_clear(&cctx, 1);
 
   personal = addr->personal;
   addr->personal = NULL;