X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=08f5d321888d62f767c0acc44fd5fa9d0f4dd668;hb=7a71ecec5189c821b7c2389b61ffd0da449031c1;hp=cdf4e58d83776220957bc220c34b030116b14874;hpb=97677c08933e16e25ecb3c12473ef1efdab7962b;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index cdf4e58..08f5d32 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -29,7 +29,6 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
 
 #include <lib-sys/unix.h>
 
@@ -55,14 +54,11 @@ struct pgp_command_context {
 };
 
 
-const char *_mutt_fmt_pgp_command (char *dest,
-                                   size_t destlen,
-                                   char op,
-                                   const char *src,
-                                   const char *prefix,
-                                   const char *ifstring,
-                                   const char *elsestring,
-                                   unsigned long data, format_flag flags)
+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,
+                      unsigned long data, format_flag flags)
 {
   char fmt[16];
   struct pgp_command_context *cctx = (struct pgp_command_context *) data;
@@ -141,12 +137,11 @@ const char *_mutt_fmt_pgp_command (char *dest,
   return (src);
 }
 
-void mutt_pgp_command (char *d, size_t dlen, struct pgp_command_context *cctx,
+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));
 }
 
 /*
@@ -329,7 +324,7 @@ pid_t pgp_invoke_verify_key (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
 
 pid_t pgp_invoke_list_keys (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
                             int pgpinfd, int pgpoutfd, int pgperrfd,
-                            pgp_ring_t keyring, LIST * hints)
+                            pgp_ring_t keyring, string_list_t * hints)
 {
   char uids[HUGE_STRING];
   char tmpuids[HUGE_STRING];