diff options
| author | mbalmer <mbalmer@NetBSD.org> | 2013-10-12 18:46:12 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@NetBSD.org> | 2013-10-12 18:46:12 +0000 |
| commit | e085539a8011dc6343c588e42d58eec952bd08df (patch) | |
| tree | 26b127095bc23206e2e71e8f8e3a26a7844e1483 /libexec/httpd | |
| parent | 7a734ebe363df4a2efb2e1babc9087a7230df783 (diff) | |
no need to check free() arguments against NULL
Diffstat (limited to 'libexec/httpd')
| -rw-r--r-- | libexec/httpd/auth-bozo.c | 11 | ||||
| -rw-r--r-- | libexec/httpd/bozohttpd.c | 14 | ||||
| -rw-r--r-- | libexec/httpd/cgi-bozo.c | 11 | ||||
| -rw-r--r-- | libexec/httpd/dir-index-bozo.c | 5 |
4 files changed, 15 insertions, 26 deletions
diff --git a/libexec/httpd/auth-bozo.c b/libexec/httpd/auth-bozo.c index d3e9a342b36..88e8d144082 100644 --- a/libexec/httpd/auth-bozo.c +++ b/libexec/httpd/auth-bozo.c @@ -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 *request) 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 --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c index a6601654710..1a22144c598 100644 --- a/libexec/httpd/bozohttpd.c +++ b/libexec/httpd/bozohttpd.c @@ -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 *request) 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 *request, int *isindex) return 1; bad_done: debug((httpd, DEBUG_FAT, "transform_request returning: 0")); - if (newfile) - free(newfile); + free(newfile); return 0; } diff --git a/libexec/httpd/cgi-bozo.c b/libexec/httpd/cgi-bozo.c index 0bdcb78d4bf..fc1b5c04b70 100644 --- a/libexec/httpd/cgi-bozo.c +++ b/libexec/httpd/cgi-bozo.c @@ -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; } diff --git a/libexec/httpd/dir-index-bozo.c b/libexec/httpd/dir-index-bozo.c index 07002b54a6e..c5d0642074e 100644 --- a/libexec/httpd/dir-index-bozo.c +++ b/libexec/httpd/dir-index-bozo.c @@ -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, const char *dirname, int isindex) bozo_flush(httpd, stdout); done: - if (file) - free(file); + free(file); return 1; } #endif /* NO_DIRINDEX_SUPPORT */ |
