Ticket #3125: mutt-null-cleanup.patch

parse.c

@@ -341 +341 @@
     /* 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)) != NULL && !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)) != NULL)
       ct->encoding = mutt_check_encoding (pc);
 #endif
     
@@ -425 +425 @@
   {
     s++;
     SKIPWS (s);
-    if ((s = mutt_get_parameter ("filename", (parms = parse_parameters (s)))) != 0)
+    if ((s = mutt_get_parameter ("filename", (parms = parse_parameters (s)))) != NULL)
       mutt_str_replace (&ct->filename, s);
-    if ((s = mutt_get_parameter ("name", parms)) != 0)
+    if ((s = mutt_get_parameter ("name", parms)) != NULL)
       ct->form_name = safe_strdup (s);
     mutt_free_parameter (&parms);
   }

snprintf.c

@@ -387 +387 @@
   int padlen, strln;     /* amount to pad */
   int cnt = 0;
   
-  if (value == 0)
+  if (value == NULL)
   {
     value = "<NULL>";
   }