Module Name: src
Committed By: mbalmer
Date: Sat Oct 12 18:46:12 UTC 2013
Modified Files:
src/libexec/httpd: auth-bozo.c bozohttpd.c cgi-bozo.c dir-index-bozo.c
Log Message:
no need to check free() arguments against NULL
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.43 -r1.44 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.22 -r1.23 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.17 -r1.18 src/libexec/httpd/dir-index-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.10 src/libexec/httpd/auth-bozo.c:1.11
--- src/libexec/httpd/auth-bozo.c:1.10 Fri Nov 18 09:51:31 2011
+++ src/libexec/httpd/auth-bozo.c Sat Oct 12 18:46:12 2013
@@ -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 @@ bozo_auth_cleanup(bozo_httpreq_t *reques
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
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.43 src/libexec/httpd/bozohttpd.c:1.44
--- src/libexec/httpd/bozohttpd.c:1.43 Sat Oct 12 17:24:06 2013
+++ src/libexec/httpd/bozohttpd.c Sat Oct 12 18:46:12 2013
@@ -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 @@ bozo_clean_request(bozo_httpreq_t *reque
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 @@ handle_redirect(bozo_httpreq_t *request,
bozo_printf(httpd, "</body></html>\n");
head:
bozo_flush(httpd, stdout);
- if (urlbuf)
- free(urlbuf);
+ free(urlbuf);
}
/*
@@ -1432,8 +1429,7 @@ transform_request(bozo_httpreq_t *reques
return 1;
bad_done:
debug((httpd, DEBUG_FAT, "transform_request returning: 0"));
- if (newfile)
- free(newfile);
+ free(newfile);
return 0;
}
Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.22 src/libexec/httpd/cgi-bozo.c:1.23
--- src/libexec/httpd/cgi-bozo.c:1.22 Thu Jul 11 07:46:37 2013
+++ src/libexec/httpd/cgi-bozo.c Sat Oct 12 18:46:12 2013
@@ -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 @@ bozo_process_cgi(bozo_httpreq_t *request
exit(0);
out:
- if (query)
- free(query);
- if (file)
- free(file);
- if (url)
- free(url);
+ free(query);
+ free(file);
+ free(url);
return 0;
}
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.17 src/libexec/httpd/dir-index-bozo.c:1.18
--- src/libexec/httpd/dir-index-bozo.c:1.17 Thu Jul 11 07:46:37 2013
+++ src/libexec/httpd/dir-index-bozo.c Sat Oct 12 18:46:12 2013
@@ -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_dir_index(bozo_httpreq_t *request,
bozo_flush(httpd, stdout);
done:
- if (file)
- free(file);
+ free(file);
return 1;
}
#endif /* NO_DIRINDEX_SUPPORT */
