Test string contents against NUL (!=)

```diff
- while (*buf)
+ while (*buf != '\0')
```

```diff
- if (bestname[0] != 0)
+ if (bestname[0] != '\0')
```

diff --git a/alias.c b/alias.c
index a2ee55ab313fefd718d4d1b90e9cfedbaa2e36ab..c059eff8a282572f138138728f3175391232cc50 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -602,7 +602,7 @@ int mutt_alias_complete(char *buf, size_t buflen)
   struct AliasList a_list = TAILQ_HEAD_INITIALIZER(a_list);
   char bestname[8192] = { 0 };
 
-  if (buf[0] != 0) /* avoid empty string as strstr argument */
+  if (buf[0] != '\0') /* avoid empty string as strstr argument */
   {
     TAILQ_FOREACH(a, &Aliases, entries)
     {
@@ -623,7 +623,7 @@ int mutt_alias_complete(char *buf, size_t buflen)
       }
     }
 
-    if (bestname[0] != 0)
+    if (bestname[0] != '\0')
     {
       if (mutt_str_strcmp(bestname, buf) != 0)
       {
@@ -647,7 +647,7 @@ int mutt_alias_complete(char *buf, size_t buflen)
 
   bestname[0] = '\0';
   mutt_alias_menu(bestname, sizeof(bestname), !TAILQ_EMPTY(&a_list) ? &a_list : &Aliases);
-  if (bestname[0] != 0)
+  if (bestname[0] != '\0')
     mutt_str_strfcpy(buf, bestname, buflen);
 
   /* free the alias list */

diff --git a/curs_lib.c b/curs_lib.c
index 9ce6d4d9999d335737b8737c9a971a14439cfef2..7c30271d32a2003abea9385270a10733aa018e7a 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -1153,7 +1153,7 @@ size_t mutt_wstr_trunc(const char *src, size_t maxlen, size_t maxwid, size_t *wi
       cl = 2; /* skip the index coloring sequence */
       cw = 0;
     }
-    else if ((cw < 0) && (cl == 1) && src[0] && (src[0] < MUTT_TREE_MAX))
+    else if ((cw < 0) && (cl == 1) && (src[0] != '\0') && (src[0] < MUTT_TREE_MAX))
       cw = 1;
     else if (cw < 0)
       cw = 0; /* unprintable wchar */

diff --git a/email/parse.c b/email/parse.c
index 2b500248fc4137e5acdda57390e94b1d842cdc30..89031e25b075ce1fb1a902e2aa3db07dea609de7 100644 (file)
--- a/email/parse.c
+++ b/email/parse.c
@@ -1067,7 +1067,7 @@ struct Envelope *mutt_rfc822_read_header(FILE *fp, struct Email *e, bool user_hd
       if (!mutt_regexlist_match(&NoSpamList, line))
       {
         /* if spam tag already exists, figure out how to amend it */
-        if (env->spam && *buf)
+        if (env->spam && (*buf != '\0'))
         {
           /* If C_SpamSeparator defined, append with separator */
           if (C_SpamSeparator)
@@ -1086,7 +1086,7 @@ struct Envelope *mutt_rfc822_read_header(FILE *fp, struct Email *e, bool user_hd
         }
 
         /* spam tag is new, and match expr is non-empty; copy */
-        else if (!env->spam && *buf)
+        else if (!env->spam && (*buf != '\0'))
         {
           env->spam = mutt_buffer_from(buf);
         }

diff --git a/init.c b/init.c
index ed6da2ffc1dc28678eacf352790a67cf7e29cf28..809975cefecd7244a27c2b8a61b282203fd97e10 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1319,7 +1319,7 @@ static enum CommandResult parse_mailboxes(struct Buffer *buf, struct Buffer *s,
     if (data & MUTT_NAMED)
     {
       mutt_extract_token(buf, s, 0);
-      if (buf->data && *buf->data)
+      if (buf->data && (*buf->data != '\0'))
       {
         m->desc = mutt_str_strdup(buf->data);
       }
@@ -2093,7 +2093,7 @@ static enum CommandResult parse_subscribe_to(struct Buffer *buf, struct Buffer *
       return MUTT_CMD_WARNING;
     }
 
-    if (buf->data && *buf->data)
+    if (buf->data && (*buf->data != '\0'))
     {
       /* Expand and subscribe */
       if (imap_subscribe(mutt_expand_path(buf->data, buf->dsize), true) != 0)
@@ -2135,7 +2135,7 @@ static enum CommandResult parse_tag_formats(struct Buffer *buf, struct Buffer *s
     char *tag = NULL, *format = NULL;
 
     mutt_extract_token(buf, s, 0);
-    if (buf->data && *buf->data)
+    if (buf->data && (*buf->data != '\0'))
       tag = mutt_str_strdup(buf->data);
     else
       continue;
@@ -2174,7 +2174,7 @@ static enum CommandResult parse_tag_transforms(struct Buffer *buf, struct Buffer
     char *tag = NULL, *transform = NULL;
 
     mutt_extract_token(buf, s, 0);
-    if (buf->data && *buf->data)
+    if (buf->data && (*buf->data != '\0'))
       tag = mutt_str_strdup(buf->data);
     else
       continue;
@@ -2547,7 +2547,7 @@ static enum CommandResult parse_unsubscribe_from(struct Buffer *buf, struct Buff
       return MUTT_CMD_WARNING;
     }
 
-    if (buf->data && *buf->data)
+    if (buf->data && (*buf->data != '\0'))
     {
       /* Expand and subscribe */
       if (imap_subscribe(mutt_expand_path(buf->data, buf->dsize), false) != 0)
@@ -3426,7 +3426,7 @@ int mutt_command_complete(char *buf, size_t buflen, int pos, int numtabs)
         return 1;
     }
 
-    if ((Completed[0] == '\0') && UserTyped[0])
+    if ((Completed[0] == '\0') && (UserTyped[0] != '\0'))
       return 0;
 
     /* NumMatched will _always_ be at least 1 since the initial
@@ -3533,7 +3533,7 @@ int mutt_command_complete(char *buf, size_t buflen, int pos, int numtabs)
         return 1;
     }
 
-    if ((Completed[0] == '\0') && UserTyped[0])
+    if ((Completed[0] == '\0') && (UserTyped[0] != '\0'))
       return 0;
 
     /* NumMatched will _always_ be at least 1 since the initial
@@ -3595,7 +3595,7 @@ int mutt_label_complete(char *buf, size_t buflen, int numtabs)
       return 1;
   }
 
-  if ((Completed[0] == '\0') && UserTyped[0])
+  if ((Completed[0] == '\0') && (UserTyped[0] != '\0'))
     return 0;
 
   /* NumMatched will _always_ be at least 1 since the initial
@@ -3649,7 +3649,7 @@ bool mutt_nm_query_complete(char *buf, size_t buflen, int pos, int numtabs)
         return true;
     }
 
-    if ((Completed[0] == '\0') && UserTyped[0])
+    if ((Completed[0] == '\0') && (UserTyped[0] != '\0'))
       return false;
 
     /* NumMatched will _always_ be at least 1 since the initial
@@ -3710,7 +3710,7 @@ bool mutt_nm_tag_complete(char *buf, size_t buflen, int numtabs)
       return true;
   }
 
-  if ((Completed[0] == '\0') && UserTyped[0])
+  if ((Completed[0] == '\0') && (UserTyped[0] != '\0'))
     return false;
 
   /* NumMatched will _always_ be at least 1 since the initial

diff --git a/mutt/date.c b/mutt/date.c
index f9509f858094ab016e91882e859380129d5dca12..c1fc8b12dd554c8d09b1219ccc588b44f3c4afae 100644 (file)
--- a/mutt/date.c
+++ b/mutt/date.c
@@ -522,7 +522,7 @@ time_t mutt_date_parse_date(const char *s, struct Tz *tz_out)
 
         if ((*ptz == '+') || (*ptz == '-'))
         {
-          if (ptz[1] && ptz[2] && ptz[3] && ptz[4] &&
+          if ((ptz[1] != '\0') && (ptz[2] != '\0') && (ptz[3] != '\0') && (ptz[4] != '\0') &&
               isdigit((unsigned char) ptz[1]) && isdigit((unsigned char) ptz[2]) &&
               isdigit((unsigned char) ptz[3]) && isdigit((unsigned char) ptz[4]))
           {

diff --git a/mutt/file.c b/mutt/file.c
index 9a7eb70c3da0cd1575d2b402c597ecc737bf1aea..01fdf066f902f58fcfe0b7b3ee172b2fd533de85 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -1283,7 +1283,7 @@ char *mutt_file_read_keyword(const char *file, char *buf, size_t buflen)
   SKIPWS(buf);
   char *start = buf;
 
-  while (*buf && !isspace(*buf))
+  while ((*buf != '\0') && !isspace(*buf))
     buf++;
 
   *buf = '\0';

diff --git a/mutt/mbyte.c b/mutt/mbyte.c
index ad6c621a613bcdd233744928e0f600a9b7052bfe..d4c79cef55644dda147033a7cec1930200b919ac 100644 (file)
--- a/mutt/mbyte.c
+++ b/mutt/mbyte.c
@@ -291,7 +291,7 @@ size_t mutt_mb_mbstowcs(wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf)
   wchar_t *wbuf = *pwbuf;
   size_t wbuflen = *pwbuflen;
 
-  while (*buf)
+  while (*buf != '\0')
   {
     memset(&st, 0, sizeof(st));
     for (; (k = mbrtowc(&wc, buf, MB_LEN_MAX, &st)) && k != (size_t)(-1) &&
@@ -305,7 +305,7 @@ size_t mutt_mb_mbstowcs(wchar_t **pwbuf, size_t *pwbuflen, size_t i, char *buf)
       }
       wbuf[i++] = wc;
     }
-    if (*buf && ((k == (size_t) -1) || (k == (size_t) -2)))
+    if ((*buf != '\0') && ((k == (size_t) -1) || (k == (size_t) -2)))
     {
       if (i >= wbuflen)
       {

diff --git a/mutt/string.c b/mutt/string.c
index 38b635ccdc7be717624bcb6d3af8254ec8984675..30f1fe752c67454fa0f257aae8328a28d9f641fc 100644 (file)
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -407,7 +407,7 @@ char *mutt_str_strcat(char *buf, size_t buflen, const char *s)
 
   buflen--; /* Space for the trailing '\0'. */
 
-  for (; *buf && buflen; buflen--)
+  for (; (*buf != '\0') && buflen; buflen--)
     buf++;
   for (; *s && buflen; buflen--)
     *buf++ = *s++;

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 3849e2971028dea7e9ce4cc376935667ef61084d..e7b2fdd0621472b6ebcb7f10d831f75b189a5c9b 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -1032,7 +1032,7 @@ static gpgme_key_t *create_recipient_set(const char *keylist, gpgme_protocol_t p
     for (i = 0; *s && *s != ' ' && i < sizeof(buf) - 1;)
       buf[i++] = *s++;
     buf[i] = '\0';
-    if (*buf)
+    if (*buf != '\0')
     {
       if ((i > 1) && (buf[i - 1] == '!'))
       {
@@ -1242,7 +1242,7 @@ static int get_micalg(gpgme_ctx_t ctx, int use_smime, char *buf, size_t buflen)
     }
   }
 
-  return *buf ? 0 : -1;
+  return (*buf != '\0') ? 0 : -1;
 }
 
 /**
@@ -4160,7 +4160,9 @@ static void print_key_info(gpgme_key_t key, FILE *fp)
     fprintf(fp, "%*s", KeyInfoPadding[KIP_FINGERPRINT], _(KeyInfoPrompts[KIP_FINGERPRINT]));
     if (is_pgp && (strlen(s) == 40))
     {
-      for (int i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++)
+      for (int i = 0; (s[0] != '\0') && (s[1] != '\0') && (s[2] != '\0') &&
+                      (s[3] != '\0') && (s[4] != '\0');
+           s += 4, i++)
       {
         putc(*s, fp);
         putc(s[1], fp);
@@ -4173,7 +4175,7 @@ static void print_key_info(gpgme_key_t key, FILE *fp)
     }
     else
     {
-      for (int i = 0; *s && s[1] && s[2]; s += 2, i++)
+      for (int i = 0; (s[0] != '\0') && (s[1] != '\0') && (s[2] != '\0'); s += 2, i++)
       {
         putc(*s, fp);
         putc(s[1], fp);

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 993ef07f53d4a368f3a8e7941267b4232d1dfc2a..c05505143534536760a9470c237c5d9a92954e2c 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -314,7 +314,7 @@ static int nntp_capabilities(struct NntpAccountData *adata)
 #endif
   if (strcasestr(authinfo, " USER "))
   {
-    if (*buf)
+    if (*buf != '\0')
       mutt_str_strcat(buf, sizeof(buf), " ");
     mutt_str_strcat(buf, sizeof(buf), "USER");
   }
@@ -674,7 +674,7 @@ static int nntp_auth(struct NntpAccountData *adata)
           if (client_len)
           {
             nntp_log_binbuf(client_out, client_len, "SASL", MUTT_SOCK_LOG_FULL);
-            if (*buf)
+            if (*buf != '\0')
               mutt_str_strcat(buf, sizeof(buf), " ");
             len = strlen(buf);
             if (sasl_encode64(client_out, client_len, buf + len,

diff --git a/pager.c b/pager.c
index 562b6863136cb7ea4a5f8d20d01a6fc526eacc57..3971d53aca924a1d7bdc0698f93ed4fd0538fd98 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1181,7 +1181,7 @@ static void resolve_types(char *buf, char *raw, struct Line *line_info, int n,
  */
 static bool is_ansi(unsigned char *buf)
 {
-  while (*buf && (isdigit(*buf) || *buf == ';'))
+  while ((*buf != '\0') && (isdigit(*buf) || *buf == ';'))
     buf++;
   return *buf == 'm';
 }

diff --git a/query.c b/query.c
index 97f4fa93ce19e8fd1114101fa5eccb1c6878320a..04a9c230e5c8986951b11aa85b9fa00b8f8a0871 100644 (file)
--- a/query.c
+++ b/query.c
@@ -333,7 +333,7 @@ static void query_menu(char *buf, size_t buflen, struct Query *results, bool ret
   if (!results)
   {
     /* Prompt for Query */
-    if ((mutt_get_field(_("Query: "), buf, buflen, 0) == 0) && buf[0])
+    if ((mutt_get_field(_("Query: "), buf, buflen, 0) == 0) && (buf[0] != '\0'))
     {
       results = run_query(buf, 0);
     }
@@ -371,7 +371,7 @@ static void query_menu(char *buf, size_t buflen, struct Query *results, bool ret
       {
         case OP_QUERY_APPEND:
         case OP_QUERY:
-          if ((mutt_get_field(_("Query: "), buf, buflen, 0) == 0) && buf[0])
+          if ((mutt_get_field(_("Query: "), buf, buflen, 0) == 0) && (buf[0] != '\0'))
           {
             struct Query *newresults = run_query(buf, 0);
 

diff --git a/rfc1524.c b/rfc1524.c
index 8fea92fcfb62174048acc25f0fbb8d0452e2709c..ab05609720695bd39b75656ebb36b33fa1624c1e 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -242,7 +242,7 @@ static bool rfc1524_mailcap_parse(struct Body *a, char *filename, char *type,
       ch = get_field(buf);
       if ((mutt_str_strcasecmp(buf, type) != 0) &&
           ((mutt_str_strncasecmp(buf, type, btlen) != 0) ||
-           ((buf[btlen] != 0) &&                         /* implicit wild */
+           ((buf[btlen] != '\0') &&                      /* implicit wild */
             (mutt_str_strcmp(buf + btlen, "/*") != 0)))) /* wildsubtype */
       {
         continue;