X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=f95cc81763029f2d4b519cd5cd49d1f053767c95;hb=5b0581b41f115cd0442037a97db313ef5b5b8822;hp=f5d45e97c5aa110f7607cf70684a6025fdd0bc2f;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;p=apps%2Fmadmutt.git diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c index f5d45e9..f95cc81 100644 --- a/lib-crypt/pgpinvoke.c +++ b/lib-crypt/pgpinvoke.c @@ -31,6 +31,8 @@ #include #include +#include + #include #include @@ -53,14 +55,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; @@ -139,7 +138,7 @@ 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, @@ -327,7 +326,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];