Fix compilation warnings in pgp.c

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

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index a4549cf..637e322 100644 (file)
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -8,38 +8,20 @@
  * please see the file GPL in the top level source directory.
  */
 
  * please see the file GPL in the top level source directory.
  */
 

-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>

 
 #include <lib-mime/mime.h>
 
 #include <lib-mime/mime.h>

+#include <lib-sys/unix.h>

 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 

-#include "mutt.h"

 #include "recvattach.h"
 #include "pgp.h"
 #include "pager.h"
 #include "sort.h"
 
 #include "recvattach.h"
 #include "pgp.h"
 #include "pager.h"
 #include "sort.h"
 

-
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <locale.h>
-

 struct pgp_cache {
   char *what;
   char *dflt;
 struct pgp_cache {
   char *what;
   char *dflt;


@@ -738,7 +720,7 @@ BODY *pgp_make_key_attachment (char *tempf)
   fclose (tempfp);
   fclose (devnull);
 
   fclose (tempfp);
   fclose (devnull);
 

-  att = mutt_new_body ();
+  att = body_new();

   att->filename = m_strdup(tempf);
   att->unlink = 1;
   att->use_disp = 0;
   att->filename = m_strdup(tempf);
   att->unlink = 1;
   att->use_disp = 0;


@@ -894,7 +876,7 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
   return NULL;
 }
 
   return NULL;
 }
 

-pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
+pgp_key_t pgp_getkeybystr (const char *p, short abilities, pgp_ring_t keyring)

 {
   string_list_t *hints = NULL;
   pgp_key_t keys;
 {
   string_list_t *hints = NULL;
   pgp_key_t keys;