Use ! instead of testing pointers against 0. Closes #3125.

diff --git a/parse.c b/parse.c
index 17b24ca120d9a171d79f578e1956f830c0a59095..143a62e92f54a321ee1b27d93adda96f11441d6a 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -296,12 +296,12 @@ void mutt_parse_content_type (char *s, BODY *ct)
     /* Some pre-RFC1521 gateways still use the "name=filename" convention,
      * but if a filename has already been set in the content-disposition,
      * let that take precedence, and don't set it here */
-    if ((pc = mutt_get_parameter( "name", ct->parameter)) != 0 && !ct->filename)
+    if ((pc = mutt_get_parameter( "name", ct->parameter)) && !ct->filename)
       ct->filename = safe_strdup(pc);
     
 #ifdef SUN_ATTACHMENT
     /* this is deep and utter perversion */
-    if ((pc = mutt_get_parameter ("conversions", ct->parameter)) != 0)
+    if ((pc = mutt_get_parameter ("conversions", ct->parameter)))
       ct->encoding = mutt_check_encoding (pc);
 #endif
     
@@ -380,9 +380,9 @@ static void parse_content_disposition (char *s, BODY *ct)
   {
     s++;
     SKIPWS (s);
-    if ((s = mutt_get_parameter ("filename", (parms = parse_parameters (s)))) != 0)
+    if ((s = mutt_get_parameter ("filename", (parms = parse_parameters (s)))))
       mutt_str_replace (&ct->filename, s);
-    if ((s = mutt_get_parameter ("name", parms)) != 0)
+    if ((s = mutt_get_parameter ("name", parms)))
       ct->form_name = safe_strdup (s);
     mutt_free_parameter (&parms);
   }

diff --git a/snprintf.c b/snprintf.c
index cd84b74b328bc7155679a17606f595028fec128d..827b362cf4a2384f66cc43f251c9e0b67c97d3be 100644 (file)
--- a/snprintf.c
+++ b/snprintf.c
@@ -406,7 +406,7 @@ static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
   int padlen, strln;     /* amount to pad */
   int cnt = 0;
   
-  if (value == 0)
+  if (!value)
   {
     value = "<NULL>";
   }