From: Richard Russon <rich@flatcap.org>
Date: Fri, 20 Jul 2018 18:32:34 +0000 (+0100)
Subject: boolify
X-Git-Tag: 2019-10-25~743^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dce4d6f2e3108641cad22d0ff7acf8ae6c7ab50b;p=neomutt

boolify
---

diff --git a/compose.c b/compose.c
index 01f136517..1e1717928 100644
--- a/compose.c
+++ b/compose.c
@@ -1293,7 +1293,7 @@ int mutt_compose_menu(struct Header *msg, char *fcc, size_t fcclen,
         char **files = NULL;
         fname[0] = 0;
 
-        if (mutt_enter_fname_full(prompt, fname, sizeof(fname), 0, 1, &files,
+        if (mutt_enter_fname_full(prompt, fname, sizeof(fname), false, true, &files,
                                   &numfiles, MUTT_SEL_MULTI) == -1 ||
             *fname == '\0')
         {
diff --git a/conn/tunnel.c b/conn/tunnel.c
index e1140a080..11d7128ab 100644
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -88,7 +88,7 @@ static int tunnel_socket_open(struct Connection *conn)
   int pid = fork();
   if (pid == 0)
   {
-    mutt_sig_unblock_system(0);
+    mutt_sig_unblock_system(false);
     const int devnull = open("/dev/null", O_RDWR);
     if (devnull < 0 || dup2(pout[0], STDIN_FILENO) < 0 ||
         dup2(pin[1], STDOUT_FILENO) < 0 || dup2(devnull, STDERR_FILENO) < 0)
@@ -107,7 +107,7 @@ static int tunnel_socket_open(struct Connection *conn)
     execle(EXECSHELL, "sh", "-c", Tunnel, NULL, mutt_envlist_getlist());
     _exit(127);
   }
-  mutt_sig_unblock_system(1);
+  mutt_sig_unblock_system(true);
 
   if (pid == -1)
   {
diff --git a/curs_lib.c b/curs_lib.c
index 3cb5f29cb..eab1f598d 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -553,8 +553,8 @@ int mutt_do_pager(const char *banner, const char *tempfile, int do_color, struct
  * @retval  0 Success
  * @retval -1 Error
  */
-int mutt_enter_fname_full(const char *prompt, char *buf, size_t buflen, int buffy,
-                          int multiple, char ***files, int *numfiles, int flags)
+int mutt_enter_fname_full(const char *prompt, char *buf, size_t buflen, bool buffy,
+                          bool multiple, char ***files, int *numfiles, int flags)
 {
   struct Event ch;
 
diff --git a/curs_lib.h b/curs_lib.h
index a81a6da84..0c0a16b45 100644
--- a/curs_lib.h
+++ b/curs_lib.h
@@ -47,7 +47,7 @@ int          mutt_any_key_to_continue(const char *s);
 int          mutt_do_pager(const char *banner, const char *tempfile, int do_color, struct Pager *info);
 void         mutt_edit_file(const char *editor, const char *file);
 void         mutt_endwin(void);
-int          mutt_enter_fname_full(const char *prompt, char *buf, size_t blen, int buffy, int multiple, char ***files, int *numfiles, int flags);
+int          mutt_enter_fname_full(const char *prompt, char *buf, size_t blen, bool buffy, bool multiple, char ***files, int *numfiles, int flags);
 void         mutt_flushinp(void);
 void         mutt_flush_macro_to_endcond(void);
 void         mutt_flush_unget_to_endcond(void);
@@ -71,8 +71,8 @@ void         mutt_unget_string(char *s);
 size_t       mutt_wstr_trunc(const char *src, size_t maxlen, size_t maxwid, size_t *width);
 int          mutt_yesorno(const char *msg, int def);
 
-#define mutt_enter_fname(A, B, C, D)   mutt_enter_fname_full(A, B, C, D, 0, NULL, NULL, 0)
-#define mutt_enter_vfolder(A, B, C, D) mutt_enter_fname_full(A, B, C, D, 0, NULL, NULL, MUTT_SEL_VFOLDER)
+#define mutt_enter_fname(A, B, C, D)   mutt_enter_fname_full(A, B, C, D, false, NULL, NULL, 0)
+#define mutt_enter_vfolder(A, B, C, D) mutt_enter_fname_full(A, B, C, D, false, NULL, NULL, MUTT_SEL_VFOLDER)
 #define mutt_get_field(A, B, C, D)     mutt_get_field_full(A, B, C, D, 0, NULL, NULL)
 #define mutt_get_password(A, B, C)     mutt_get_field_unbuffered(A, B, C, MUTT_PASS)
 
diff --git a/filter.c b/filter.c
index 6978f9cc5..5c74f46cf 100644
--- a/filter.c
+++ b/filter.c
@@ -108,7 +108,7 @@ pid_t mutt_create_filter_fd(const char *cmd, FILE **in, FILE **out, FILE **err,
   thepid = fork();
   if (thepid == 0)
   {
-    mutt_sig_unblock_system(0);
+    mutt_sig_unblock_system(false);
 
     if (in)
     {
@@ -158,7 +158,7 @@ pid_t mutt_create_filter_fd(const char *cmd, FILE **in, FILE **out, FILE **err,
   }
   else if (thepid == -1)
   {
-    mutt_sig_unblock_system(1);
+    mutt_sig_unblock_system(true);
 
     if (in)
     {
@@ -226,7 +226,7 @@ int mutt_wait_filter(pid_t pid)
   int rc;
 
   waitpid(pid, &rc, 0);
-  mutt_sig_unblock_system(1);
+  mutt_sig_unblock_system(true);
   rc = WIFEXITED(rc) ? WEXITSTATUS(rc) : -1;
 
   return rc;
diff --git a/mutt/signal.c b/mutt/signal.c
index 6a824c686..281a08205 100644
--- a/mutt/signal.c
+++ b/mutt/signal.c
@@ -196,7 +196,7 @@ void mutt_sig_block_system(void)
  * mutt_sig_unblock_system - Restore previously blocked signals
  * @param catch If true, restore previous SIGINT, SIGQUIT behaviour
  */
-void mutt_sig_unblock_system(int catch)
+void mutt_sig_unblock_system(bool catch)
 {
   if (!SysSignalsBlocked)
     return;
diff --git a/mutt/signal2.h b/mutt/signal2.h
index f29df659b..e5288364b 100644
--- a/mutt/signal2.h
+++ b/mutt/signal2.h
@@ -32,6 +32,6 @@ void mutt_sig_empty_handler(int sig);
 void mutt_sig_exit_handler(int sig);
 void mutt_sig_init(sig_handler_t sig_fn, sig_handler_t exit_fn);
 void mutt_sig_unblock(void);
-void mutt_sig_unblock_system(int catch);
+void mutt_sig_unblock_system(bool catch);
 
 #endif /* _MUTT_SIGNAL_H */
diff --git a/mutt_thread.c b/mutt_thread.c
index 0233ecd03..aa40fd4ef 100644
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -587,7 +587,7 @@ static int compare_threads(const void *a, const void *b)
   }
 }
 
-struct MuttThread *mutt_sort_subthreads(struct MuttThread *thread, int init)
+struct MuttThread *mutt_sort_subthreads(struct MuttThread *thread, bool init)
 {
   struct MuttThread **array = NULL, *sort_key = NULL, *top = NULL, *tmp = NULL;
   struct Header *oldsort_key = NULL;
@@ -717,7 +717,7 @@ struct MuttThread *mutt_sort_subthreads(struct MuttThread *thread, int init)
   }
 }
 
-static void check_subjects(struct Context *ctx, int init)
+static void check_subjects(struct Context *ctx, bool init)
 {
   struct Header *cur = NULL;
   struct MuttThread *tmp = NULL;
@@ -751,7 +751,7 @@ static void check_subjects(struct Context *ctx, int init)
   }
 }
 
-void mutt_sort_threads(struct Context *ctx, int init)
+void mutt_sort_threads(struct Context *ctx, bool init)
 {
   struct Header *cur = NULL;
   int i, oldsort, using_refs = 0;
@@ -767,7 +767,7 @@ void mutt_sort_threads(struct Context *ctx, int init)
   Sort = SortAux;
 
   if (!ctx->thread_hash)
-    init = 1;
+    init = true;
 
   if (init)
   {
diff --git a/mutt_thread.h b/mutt_thread.h
index 0248852ac..fa6f602ba 100644
--- a/mutt_thread.h
+++ b/mutt_thread.h
@@ -67,8 +67,8 @@ int mutt_messages_in_thread(struct Context *ctx, struct Header *hdr, int flag);
 void mutt_draw_tree(struct Context *ctx);
 
 void mutt_clear_threads(struct Context *ctx);
-struct MuttThread *mutt_sort_subthreads(struct MuttThread *thread, int init);
-void mutt_sort_threads(struct Context *ctx, int init);
+struct MuttThread *mutt_sort_subthreads(struct MuttThread *thread, bool init);
+void mutt_sort_threads(struct Context *ctx, bool init);
 int mutt_parent_message(struct Context *ctx, struct Header *hdr, int find_root);
 void mutt_set_virtual(struct Context *ctx);
 struct Hash *mutt_make_id_hash(struct Context *ctx);
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 930099fa3..041be471f 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -2203,7 +2203,7 @@ int smime_gpgme_decrypt_mime(FILE *fpin, FILE **fpout, struct Body *b, struct Bo
  * @retval  0 Success
  * @retval -1 Error
  */
-static int pgp_gpgme_extract_keys(gpgme_data_t keydata, FILE **fp, int dryrun)
+static int pgp_gpgme_extract_keys(gpgme_data_t keydata, FILE **fp, bool dryrun)
 {
   /* there's no side-effect free way to view key data in GPGME,
    * so we import the key into a temporary keyring */
@@ -2462,7 +2462,7 @@ void pgp_gpgme_invoke_import(const char *fname)
     return;
   }
 
-  if (pgp_gpgme_extract_keys(keydata, &out, 0))
+  if (pgp_gpgme_extract_keys(keydata, &out, false))
   {
     mutt_error(_("Error extracting key data!\n"));
   }
@@ -2613,7 +2613,7 @@ int pgp_gpgme_application_handler(struct Body *m, struct State *s)
       /* Invoke PGP if needed */
       if (pgp_keyblock)
       {
-        pgp_gpgme_extract_keys(armored_data, &pgpout, 1);
+        pgp_gpgme_extract_keys(armored_data, &pgpout, true);
       }
       else if (!clearsign || (s->flags & MUTT_VERIFY))
       {
@@ -5231,10 +5231,10 @@ int smime_gpgme_send_menu(struct Header *msg)
  * @param h Header of the email
  * @retval true If sender is verified
  */
-static int verify_sender(struct Header *h)
+static bool verify_sender(struct Header *h)
 {
   struct Address *sender = NULL;
-  unsigned int rc = 1;
+  bool rc = true;
 
   if (h->env->from)
   {
@@ -5264,7 +5264,7 @@ static int verify_sender(struct Header *h)
           if (!at_sign)
           {
             if (strncmp(uid->email + 1, sender->mailbox, sender_length) == 0)
-              rc = 0;
+              rc = false;
           }
           else
           {
@@ -5285,7 +5285,7 @@ static int verify_sender(struct Header *h)
             domainname_match =
                 (strncasecmp(tmp_email, tmp_sender, domainname_length) == 0);
             if (mailbox_match && domainname_match)
-              rc = 0;
+              rc = false;
           }
         }
       }
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 5143f07ec..d568b15eb 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -1103,7 +1103,7 @@ char *smime_class_find_keys(struct Address *addrlist, bool oppenc_mode)
  * @retval -1 Error
  * @retval -2 Error
  */
-static int smime_handle_cert_email(char *certificate, char *mailbox, int copy,
+static int smime_handle_cert_email(char *certificate, char *mailbox, bool copy,
                                    char ***buffer, int *num)
 {
   char email[STRING];
@@ -1479,7 +1479,7 @@ int smime_class_verify_sender(struct Header *h)
     if (certfile)
     {
       mutt_file_unlink(tempfname);
-      if (smime_handle_cert_email(certfile, mbox, 0, NULL, NULL))
+      if (smime_handle_cert_email(certfile, mbox, false, NULL, NULL))
       {
         if (isendwin())
           mutt_any_key_to_continue(NULL);
diff --git a/sendlib.c b/sendlib.c
index 225ffd126..137b0626a 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -2639,7 +2639,7 @@ static int send_msg(const char *path, char **args, const char *msg, char **tempf
   else
     st = S_ERR; /* error */
 
-  mutt_sig_unblock_system(1);
+  mutt_sig_unblock_system(true);
 
   return st;
 }
diff --git a/sort.c b/sort.c
index ead1a23ef..78625b4fe 100644
--- a/sort.c
+++ b/sort.c
@@ -452,7 +452,7 @@ void mutt_sort_headers(struct Context *ctx, int init)
       int i = Sort;
       Sort = SortAux;
       if (ctx->tree)
-        ctx->tree = mutt_sort_subthreads(ctx->tree, 1);
+        ctx->tree = mutt_sort_subthreads(ctx->tree, true);
       Sort = i;
       OptSortSubthreads = false;
     }
diff --git a/system.c b/system.c
index 285800ce1..adada6261 100644
--- a/system.c
+++ b/system.c
@@ -77,7 +77,7 @@ int mutt_system(const char *cmd)
     act.sa_flags = 0;
 
     /* reset signals for the child; not really needed, but... */
-    mutt_sig_unblock_system(0);
+    mutt_sig_unblock_system(false);
     act.sa_handler = SIG_DFL;
     act.sa_flags = 0;
     sigemptyset(&act.sa_mask);
@@ -99,7 +99,7 @@ int mutt_system(const char *cmd)
   sigaction(SIGTSTP, &oldtstp, NULL);
 
   /* reset SIGINT, SIGQUIT and SIGCHLD */
-  mutt_sig_unblock_system(1);
+  mutt_sig_unblock_system(true);
 
   rc = (thepid != -1) ? (WIFEXITED(rc) ? WEXITSTATUS(rc) : -1) : -1;