X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=b3d42a28210c683d917d787fa056a110b85ec652;hp=f95cc81763029f2d4b519cd5cd49d1f053767c95;hb=b62cf5fb77a75e17b176141d232655e5bd8b7fe1;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index f95cc81..b3d42a2 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -11,33 +11,12 @@
  * is almost entirely format based.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#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-lib/debug.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 
-#include "mutt.h"
 #include "mutt_idna.h"
 #include "pgp.h"
 
@@ -55,7 +34,7 @@ struct pgp_command_context {
 };
 
 
-const char *
+static const char *
 _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
                       char op, const char *src, const char *prefix,
                       const char *ifstring, const char *elsestring,
@@ -138,12 +117,12 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
   return (src);
 }
 
-void mutt_pgp_command (char *d, ssize_t dlen, struct pgp_command_context *cctx,
-                       const char *fmt)
+static void
+mutt_pgp_command(char *d, ssize_t dlen, struct pgp_command_context *cctx,
+                 const char *fmt)
 {
   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
                      (unsigned long) cctx, 0);
-  debug_print (2, ("%s\n", d));
 }
 
 /*