begin to work on alias.[hc]

[apps/madmutt.git] / lib-crypt / pgp.c

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 26f79d9..0a35e6b 100644 (file)
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -29,15 +29,17 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-lib/debug.h>
+
 #include "mutt.h"
-#include "enter.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "pgp.h"
 #include "copy.h"
 #include "attach.h"
 
-#include "lib/debug.h"
 
 #include <sys/wait.h>
 #include <string.h>
@@ -60,7 +62,6 @@
 #endif
 
 #include "crypt.h"
-#include "mutt_menu.h"
 
 
 char PgpPass[LONG_STRING];
@@ -68,7 +69,7 @@ time_t PgpExptime = 0;          /* when does the cached passphrase expire? */
 
 void pgp_void_passphrase (void)
 {
-  p_clear(PgpPass, sizeof(PgpPass));
+  p_clear(PgpPass, countof(PgpPass));
   PgpExptime = 0;
 }
 
@@ -419,7 +420,6 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
       }
       else if (pgpout) {
         FGETCONV *fc;
-        int c;
 
         rewind (pgpout);
         state_set_prefix (s);