Don't test boundary in output_content() for NULL; it never is.

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index c997445..89b4b93 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -96,7 +96,7 @@ output_content (CT ct, FILE *out)
      * headers (since it has no body).
      */
     if (ct->c_ctexbody) {
      * headers (since it has no body).
      */
     if (ct->c_ctexbody) {

-       if (boundary && *boundary != '\0')
+       if (*boundary != '\0')

            free(boundary);
        return OK;
     }
            free(boundary);
        return OK;
     }


@@ -124,7 +124,7 @@ output_content (CT ct, FILE *out)
 
            fprintf (out, "\n--%s\n", boundary);
            if (output_content (p, out) == NOTOK) {
 
            fprintf (out, "\n--%s\n", boundary);
            if (output_content (p, out) == NOTOK) {

-               if (boundary && *boundary != '\0')
+               if (*boundary != '\0')

                    free(boundary);
                 return NOTOK;
            }
                    free(boundary);
                 return NOTOK;
            }


@@ -205,7 +205,7 @@ output_content (CT ct, FILE *out)
        break;
     }
 
        break;
     }
 

-    if (boundary && *boundary != '\0')
+    if (*boundary != '\0')

        free(boundary);
 
     return result;
        free(boundary);
 
     return result;