boolify need_passphrase

diff --git a/commands.c b/commands.c
index ca52386cf8db1ec19e6a7cdba61f04359f14ca13..3b1a7d54540041bc3c024c8e06e527c337f64a88 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -783,7 +783,8 @@ int mutt_save_message_ctx(struct Header *h, int delete, int decode, int decrypt,
  */
 int mutt_save_message(struct Header *h, int delete, int decode, int decrypt)
 {
-  int need_passphrase = 0, app = 0;
+  bool need_passphrase = false;
+  int app = 0;
   char buf[PATH_MAX];
   const char *prompt = NULL;
   struct Context ctx;
@@ -812,7 +813,7 @@ int mutt_save_message(struct Header *h, int delete, int decode, int decrypt)
   {
     if (WithCrypto)
     {
-      need_passphrase = h->security & ENCRYPT;
+      need_passphrase = (h->security & ENCRYPT);
       app = h->security;
     }
     mutt_message_hook(Context, h, MUTT_MESSAGEHOOK);
@@ -836,7 +837,7 @@ int mutt_save_message(struct Header *h, int delete, int decode, int decrypt)
       mutt_default_save(buf, sizeof(buf), h);
       if (WithCrypto)
       {
-        need_passphrase = h->security & ENCRYPT;
+        need_passphrase = (h->security & ENCRYPT);
         app = h->security;
       }
       h = NULL;

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index a7d9668ad2963ca808aca60e928f4361cfb576f3..f07cbdb3781fe9ebb099a2328d7dc20fb51ef15d 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -445,7 +445,7 @@ int pgp_class_application_handler(struct Body *m, struct State *s)
         }
 
         thepid = pgp_invoke_decode(&pgpin, NULL, &pgperr, -1, fileno(pgpout),
-                                   -1, tmpfname, needpass);
+                                   -1, tmpfname, (needpass != 0));
         if (thepid == -1)
         {
           mutt_file_fclose(&pgpout);

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 78b4ad4ea55c205ca07014fcc464ae449738f33b..7763d466e91c88ff2941f1ba808f58fd5f2c4eaf 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -52,7 +52,7 @@
  */
 struct PgpCommandContext
 {
-  short need_passphrase; /**< %p */
+  bool need_passphrase;  /**< %p */
   const char *fname;     /**< %f */
   const char *sig_fname; /**< %s */
   const char *signas;    /**< %a */
@@ -153,7 +153,7 @@ static void mutt_pgp_command(char *buf, size_t buflen,
  */
 
 static pid_t pgp_invoke(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd,
-                        int pgperrfd, short need_passphrase, const char *fname,
+                        int pgperrfd, bool need_passphrase, const char *fname,
                         const char *sig_fname, const char *ids, const char *format)
 {
   struct PgpCommandContext cctx;
@@ -185,7 +185,7 @@ static pid_t pgp_invoke(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
  */
 
 pid_t pgp_invoke_decode(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
-                        int pgpoutfd, int pgperrfd, const char *fname, short need_passphrase)
+                        int pgpoutfd, int pgperrfd, const char *fname, bool need_passphrase)
 {
   return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd,
                     need_passphrase, fname, NULL, NULL, PgpDecodeCommand);
@@ -194,21 +194,21 @@ pid_t pgp_invoke_decode(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
 pid_t pgp_invoke_verify(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
                         int pgpoutfd, int pgperrfd, const char *fname, const char *sig_fname)
 {
-  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0,
+  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, false,
                     fname, sig_fname, NULL, PgpVerifyCommand);
 }
 
 pid_t pgp_invoke_decrypt(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
                          int pgpoutfd, int pgperrfd, const char *fname)
 {
-  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 1,
+  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, true,
                     fname, NULL, NULL, PgpDecryptCommand);
 }
 
 pid_t pgp_invoke_sign(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
                       int pgpoutfd, int pgperrfd, const char *fname)
 {
-  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 1,
+  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, true,
                     fname, NULL, NULL, PgpSignCommand);
 }
 
@@ -218,12 +218,12 @@ pid_t pgp_invoke_encrypt(FILE **pgpin, FILE **pgpout, FILE **pgperr,
 {
   if (sign)
   {
-    return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 1,
+    return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, true,
                       fname, NULL, uids, PgpEncryptSignCommand);
   }
   else
   {
-    return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0,
+    return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, false,
                       fname, NULL, uids, PgpEncryptOnlyCommand);
   }
 }
@@ -235,12 +235,12 @@ pid_t pgp_invoke_traditional(FILE **pgpin, FILE **pgpout, FILE **pgperr,
   if (flags & ENCRYPT)
   {
     return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd,
-                      (flags & SIGN) ? 1 : 0, fname, NULL, uids,
+                      (flags & SIGN), fname, NULL, uids,
                       (flags & SIGN) ? PgpEncryptSignCommand : PgpEncryptOnlyCommand);
   }
   else
   {
-    return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 1,
+    return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, true,
                       fname, NULL, NULL, PgpClearsignCommand);
   }
 }
@@ -319,14 +319,14 @@ void pgp_class_invoke_getkeys(struct Address *addr)
 pid_t pgp_invoke_export(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
                         int pgpoutfd, int pgperrfd, const char *uids)
 {
-  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0, NULL,
+  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, false, NULL,
                     NULL, uids, PgpExportCommand);
 }
 
 pid_t pgp_invoke_verify_key(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd,
                             int pgpoutfd, int pgperrfd, const char *uids)
 {
-  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0, NULL,
+  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, false, NULL,
                     NULL, uids, PgpVerifyKeyCommand);
 }
 
@@ -361,6 +361,6 @@ pid_t pgp_invoke_list_keys(FILE **pgpin, FILE **pgpout, FILE **pgperr,
     strcpy(uids, tmpuids);
   }
 
-  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, 0, NULL, NULL,
+  return pgp_invoke(pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd, false, NULL, NULL,
                     uids, keyring == PGP_SECRING ? PgpListSecringCommand : PgpListPubringCommand);
 }

diff --git a/ncrypt/pgpinvoke.h b/ncrypt/pgpinvoke.h
index 2341a96cd1e8d12867405b874742d546983e144c..11cde68b8025d3e031ef4bdd84ea102e94c07839 100644 (file)
--- a/ncrypt/pgpinvoke.h
+++ b/ncrypt/pgpinvoke.h
@@ -35,7 +35,7 @@ struct ListHead;
 void pgp_class_invoke_import(const char *fname);
 void pgp_class_invoke_getkeys(struct Address *addr);
 
-pid_t pgp_invoke_decode     (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *fname, short need_passphrase);
+pid_t pgp_invoke_decode     (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *fname, bool need_passphrase);
 pid_t pgp_invoke_decrypt    (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *fname);
 pid_t pgp_invoke_encrypt    (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *fname, const char *uids, int sign);
 pid_t pgp_invoke_export     (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *uids);