boolify do_locales

diff --git a/browser.c b/browser.c
index 806d276370f2135147fe420f85c6af2b9ed64dfe..d7b6714953ecf74cd5c1005220e038b5bfca2cc3 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -378,7 +378,7 @@ static const char *folder_format_str(char *buf, size_t buflen, size_t col, int c
     case 'D':
       if (folder->ff->local)
       {
-        int do_locales = true;
+        bool do_locales = true;
 
         if (op == 'D')
         {

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 8fbf4f7d14c9e1488049389f4e85953832d623f1..f04a97ca3ab9c15835a640ead28194fc1d872452 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -3438,7 +3438,7 @@ static const char *crypt_format_str(char *buf, size_t buflen, size_t col, int co
     case '[':
     {
       char buf2[SHORT_STRING];
-      int do_locales;
+      bool do_locales = true;
       struct tm *tm = NULL;
       size_t len;
 
@@ -3447,11 +3447,9 @@ static const char *crypt_format_str(char *buf, size_t buflen, size_t col, int co
       const char *cp = src;
       if (*cp == '!')
       {
-        do_locales = 0;
+        do_locales = false;
         cp++;
       }
-      else
-        do_locales = 1;
 
       len = buflen - 1;
       while (len > 0 && *cp != ']')

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 1a9a6bf4c871afc0ac24055ed2c90797779a689e..eaaf638730bb5076a84b474ed97261534fba59fb 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -261,7 +261,7 @@ static const char *pgp_entry_fmt(char *buf, size_t buflen, size_t col, int cols,
 
     {
       char buf2[SHORT_STRING];
-      int do_locales;
+      bool do_locales = true;
       struct tm *tm = NULL;
       size_t len;
 
@@ -270,11 +270,9 @@ static const char *pgp_entry_fmt(char *buf, size_t buflen, size_t col, int cols,
       const char *cp = src;
       if (*cp == '!')
       {
-        do_locales = 0;
+        do_locales = false;
         cp++;
       }
-      else
-        do_locales = 1;
 
       len = buflen - 1;
       while (len > 0 && *cp != ']')