[src/trunk]: src/libexec/httpd no need to check free() arguments against NULL

[mbalmer <mbalmer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6be6e493e81f
branches:  trunk
changeset: 790458:6be6e493e81f
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sat Oct 12 18:46:12 2013 +0000

description:
no need to check free() arguments against NULL

diffstat:

 libexec/httpd/auth-bozo.c      |  11 ++++-------
 libexec/httpd/bozohttpd.c      |  14 +++++---------
 libexec/httpd/cgi-bozo.c       |  11 ++++-------
 libexec/httpd/dir-index-bozo.c |   5 ++---
 4 files changed, 15 insertions(+), 26 deletions(-)

diffs (113 lines):

diff -r c903a19051d5 -r 6be6e493e81f libexec/httpd/auth-bozo.c
--- a/libexec/httpd/auth-bozo.c Sat Oct 12 17:26:32 2013 +0000
+++ b/libexec/httpd/auth-bozo.c Sat Oct 12 18:46:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-bozo.c,v 1.10 2011/11/18 09:51:31 mrg Exp $       */
+/*     $NetBSD: auth-bozo.c,v 1.11 2013/10/12 18:46:12 mbalmer Exp $   */
 
 /*     $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $       */
 
@@ -119,12 +119,9 @@
 
        if (request == NULL)
                return;
-       if (request->hr_authuser)
-               free(request->hr_authuser);
-       if (request->hr_authpass)
-               free(request->hr_authpass);
-       if (request->hr_authrealm)
-               free(request->hr_authrealm);
+       free(request->hr_authuser);
+       free(request->hr_authpass);
+       free(request->hr_authrealm);
 }
 
 int
diff -r c903a19051d5 -r 6be6e493e81f libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Sat Oct 12 17:26:32 2013 +0000
+++ b/libexec/httpd/bozohttpd.c Sat Oct 12 18:46:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.c,v 1.43 2013/10/12 17:24:06 mbalmer Exp $   */
+/*     $NetBSD: bozohttpd.c,v 1.44 2013/10/12 18:46:12 mbalmer Exp $   */
 
 /*     $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $      */
 
@@ -347,12 +347,10 @@
            hdr = SIMPLEQ_NEXT(hdr, h_next)) {
                free(hdr->h_value);
                free(hdr->h_header);
-               if (ohdr)
-                       free(ohdr);
+               free(ohdr);
                ohdr = hdr;
        }
-       if (ohdr)
-               free(ohdr);
+       free(ohdr);
 
        free(request);
 }
@@ -1016,8 +1014,7 @@
        bozo_printf(httpd, "</body></html>\n");
 head:
        bozo_flush(httpd, stdout);
-       if (urlbuf)
-               free(urlbuf);
+       free(urlbuf);
 }
 
 /*
@@ -1432,8 +1429,7 @@
        return 1;
 bad_done:
        debug((httpd, DEBUG_FAT, "transform_request returning: 0"));
-       if (newfile)
-               free(newfile);
+       free(newfile);
        return 0;
 }
 
diff -r c903a19051d5 -r 6be6e493e81f libexec/httpd/cgi-bozo.c
--- a/libexec/httpd/cgi-bozo.c  Sat Oct 12 17:26:32 2013 +0000
+++ b/libexec/httpd/cgi-bozo.c  Sat Oct 12 18:46:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgi-bozo.c,v 1.22 2013/07/11 07:46:37 mrg Exp $        */
+/*     $NetBSD: cgi-bozo.c,v 1.23 2013/10/12 18:46:12 mbalmer Exp $    */
 
 /*     $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $        */
 
@@ -490,12 +490,9 @@
        exit(0);
 
  out:
-       if (query)
-               free(query);
-       if (file)
-               free(file);
-       if (url)
-               free(url);
+       free(query);
+       free(file);
+       free(url);
        return 0;
 }
 
diff -r c903a19051d5 -r 6be6e493e81f libexec/httpd/dir-index-bozo.c
--- a/libexec/httpd/dir-index-bozo.c    Sat Oct 12 17:26:32 2013 +0000
+++ b/libexec/httpd/dir-index-bozo.c    Sat Oct 12 18:46:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir-index-bozo.c,v 1.17 2013/07/11 07:46:37 mrg Exp $  */
+/*     $NetBSD: dir-index-bozo.c,v 1.18 2013/10/12 18:46:12 mbalmer Exp $      */
 
 /*     $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $  */
 
@@ -205,8 +205,7 @@
        bozo_flush(httpd, stdout);
 
 done:
-       if (file)
-               free(file);
+       free(file);
        return 1;
 }
 #endif /* NO_DIRINDEX_SUPPORT */