From: Richard Russon <rich@flatcap.org>
Date: Wed, 28 Mar 2018 17:21:30 +0000 (+0100)
Subject: test ints against 0
X-Git-Tag: neomutt-20180512~70^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41f7040640001f6a26cd361941e810ee693e94a3;p=neomutt

test ints against 0
---

diff --git a/bcache.c b/bcache.c
index ca845a172..52f9109a5 100644
--- a/bcache.c
+++ b/bcache.c
@@ -52,7 +52,7 @@ static int bcache_path(struct Account *account, const char *mailbox, char *dst,
   struct Url url;
   int len;
 
-  if (!account || !MessageCachedir || !*MessageCachedir || !dst || !dstlen)
+  if (!account || !MessageCachedir || !*MessageCachedir || !dst || (dstlen == 0))
     return -1;
 
   /* make up a Url we can turn into a string */
diff --git a/browser.c b/browser.c
index e02a0ccd3..c8f38b4ac 100644
--- a/browser.c
+++ b/browser.c
@@ -1400,7 +1400,7 @@ void mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numfi
     {
       case OP_GENERIC_SELECT_ENTRY:
 
-        if (!state.entrylen)
+        if (state.entrylen == 0)
         {
           mutt_error(_("No files match the file mask"));
           break;
@@ -1849,7 +1849,7 @@ void mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numfi
               goto bail;
             }
             kill_prefix = 0;
-            if (!state.entrylen)
+            if (state.entrylen == 0)
             {
               mutt_error(_("No files match the file mask"));
               break;
@@ -1988,7 +1988,7 @@ void mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numfi
         break;
 
       case OP_BROWSER_VIEW_FILE:
-        if (!state.entrylen)
+        if (state.entrylen == 0)
         {
           mutt_error(_("No files match the file mask"));
           break;
@@ -2129,7 +2129,7 @@ void mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numfi
             menu->redraw = REDRAW_FULL;
             j = 0;
           }
-          else if (!state.entrylen)
+          else if (state.entrylen == 0)
           {
             mutt_error(_("No newsgroups match the mask"));
             break;
diff --git a/conn/sasl.c b/conn/sasl.c
index 368f2e610..de666c839 100644
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -431,7 +431,7 @@ static int mutt_sasl_conn_read(struct Connection *conn, char *buf, size_t len)
         mutt_debug(1, "SASL decode failed: %s\n", sasl_errstring(rc, NULL, NULL));
         goto out;
       }
-    } while (!sasldata->blen);
+    } while (sasldata->blen == 0);
 
     olen = (sasldata->blen - sasldata->bpos > len) ? len :
                                                      sasldata->blen - sasldata->bpos;
diff --git a/imap/browse.c b/imap/browse.c
index 2f1de74f0..4b1d5bd2a 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -331,7 +331,7 @@ int imap_browse(char *path, struct BrowserState *state)
   if (browse_add_list_result(idata, buf, state, 0))
     goto fail;
 
-  if (!state->entrylen)
+  if (state->entrylen == 0)
   {
     mutt_error(_("No such folder"));
     goto fail;
diff --git a/imap/util.c b/imap/util.c
index 1cec26850..62b98db7f 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -516,7 +516,7 @@ void imap_pretty_mailbox(char *path)
     if (tlen && mutt_account_match(&home.account, &target.account) &&
         (mutt_str_strncmp(home.mbox, target.mbox, hlen) == 0))
     {
-      if (!hlen)
+      if (hlen == 0)
         home_match = true;
       else if (ImapDelimChars)
         for (delim = ImapDelimChars; *delim != '\0'; delim++)
@@ -531,7 +531,7 @@ void imap_pretty_mailbox(char *path)
   {
     *path++ = '=';
     /* copy remaining path, skipping delimiter */
-    if (!hlen)
+    if (hlen == 0)
       hlen = -1;
     memcpy(path, target.mbox + hlen + 1, tlen - hlen - 1);
     path[tlen - hlen - 1] = '\0';
@@ -815,7 +815,7 @@ void imap_quote_string(char *dest, size_t dlen, const char *src)
     if (strchr(quote, *s))
     {
       dlen -= 2;
-      if (!dlen)
+      if (dlen == 0)
         break;
       *pt++ = '\\';
       *pt++ = *s;
diff --git a/init.c b/init.c
index af04193ce..d6c3bb2e1 100644
--- a/init.c
+++ b/init.c
@@ -281,7 +281,7 @@ static struct MbTable *parse_mbtable(const char *s)
 
   t = mutt_mem_calloc(1, sizeof(struct MbTable));
   slen = mutt_str_strlen(s);
-  if (!slen)
+  if (slen == 0)
     return t;
 
   t->orig_str = mutt_str_strdup(s);
diff --git a/mutt/address.c b/mutt/address.c
index a1fd28f63..dbcbdabd6 100644
--- a/mutt/address.c
+++ b/mutt/address.c
@@ -1035,7 +1035,7 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
   {
     if (strpbrk(addr->personal, AddressSpecials))
     {
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = '"';
       buflen--;
@@ -1046,19 +1046,19 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
           *pbuf++ = '\\';
           buflen--;
         }
-        if (!buflen)
+        if (buflen == 0)
           goto done;
         *pbuf++ = *pc;
         buflen--;
       }
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = '"';
       buflen--;
     }
     else
     {
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       mutt_str_strfcpy(pbuf, addr->personal, buflen);
       len = mutt_str_strlen(pbuf);
@@ -1066,7 +1066,7 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
       buflen -= len;
     }
 
-    if (!buflen)
+    if (buflen == 0)
       goto done;
     *pbuf++ = ' ';
     buflen--;
@@ -1074,7 +1074,7 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
 
   if (addr->personal || (addr->mailbox && *addr->mailbox == '@'))
   {
-    if (!buflen)
+    if (buflen == 0)
       goto done;
     *pbuf++ = '<';
     buflen--;
@@ -1082,7 +1082,7 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
 
   if (addr->mailbox)
   {
-    if (!buflen)
+    if (buflen == 0)
       goto done;
     if ((mutt_str_strcmp(addr->mailbox, "@") != 0) && !display)
     {
@@ -1104,7 +1104,7 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
 
     if (addr->personal || (addr->mailbox && *addr->mailbox == '@'))
     {
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = '>';
       buflen--;
@@ -1112,11 +1112,11 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
 
     if (addr->group)
     {
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = ':';
       buflen--;
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = ' ';
       buflen--;
@@ -1124,7 +1124,7 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool
   }
   else
   {
-    if (!buflen)
+    if (buflen == 0)
       goto done;
     *pbuf++ = ';';
     buflen--;
@@ -1161,11 +1161,11 @@ size_t mutt_addr_write(char *buf, size_t buflen, struct Address *addr, bool disp
 
     pbuf += len;
     buflen -= len;
-    if (!buflen)
+    if (buflen == 0)
       goto done;
     *pbuf++ = ',';
     buflen--;
-    if (!buflen)
+    if (buflen == 0)
       goto done;
     *pbuf++ = ' ';
     buflen--;
@@ -1187,11 +1187,11 @@ size_t mutt_addr_write(char *buf, size_t buflen, struct Address *addr, bool disp
        group terminator, add a comma to separate the addresses */
     if (addr->next && addr->next->mailbox && !addr->group)
     {
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = ',';
       buflen--;
-      if (!buflen)
+      if (buflen == 0)
         goto done;
       *pbuf++ = ' ';
       buflen--;
diff --git a/mutt/buffer.c b/mutt/buffer.c
index 367045c95..eb2d96d53 100644
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -170,7 +170,7 @@ int mutt_buffer_printf(struct Buffer *buf, const char *fmt, ...)
   doff = buf->dptr - buf->data;
   blen = buf->dsize - doff;
   /* solaris 9 vsnprintf barfs when blen is 0 */
-  if (!blen)
+  if (blen == 0)
   {
     blen = 128;
     buf->dsize += blen;
diff --git a/ncrypt/pgppacket.c b/ncrypt/pgppacket.c
index 8970a46fa..001047855 100644
--- a/ncrypt/pgppacket.c
+++ b/ncrypt/pgppacket.c
@@ -72,7 +72,7 @@ unsigned char *pgp_read_packet(FILE *fp, size_t *len)
   if (startpos < 0)
     return NULL;
 
-  if (!plen)
+  if (plen == 0)
   {
     plen = CHUNKSIZE;
     pbuf = mutt_mem_malloc(plen);
diff --git a/rfc3676.c b/rfc3676.c
index 5ba7a384d..ec36d3160 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -312,7 +312,7 @@ int rfc3676_handler(struct Body *a, struct State *s)
 
     /* print fixed-and-standalone, fixed-and-empty and sigsep lines as
      * fixed lines */
-    if ((fixed && (!fst.width || !buf_len)) || sigsep)
+    if ((fixed && ((fst.width == 0) || (buf_len == 0))) || sigsep)
     {
       /* if we're within a flowed paragraph, terminate it */
       flush_par(s, &fst);