7 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/httpd/src/main/util.c b/usr.sbin/httpd/src/main/util.c
index 90e78c71c73..556416fa4dc 100644
--- a/usr.sbin/httpd/src/main/util.c
+++ b/usr.sbin/httpd/src/main/util.c
@@ -750,7 +750,7 @@ API_EXPORT(char *) ap_getword_conf(pool *p, const char **line)
     char *res;
     char quote;
 
-    while (*str && ap_isspace(*str))
+    while (ap_isspace(*str))
 	++str;
 
     if (!*str) {
@@ -782,7 +782,7 @@ API_EXPORT(char *) ap_getword_conf(pool *p, const char **line)
 	res = substring_conf(p, str, strend - str, 0);
     }
 
-    while (*strend && ap_isspace(*strend))
+    while (ap_isspace(*strend))
 	++strend;
     *line = strend;
     return res;
@@ -1314,7 +1314,7 @@ API_EXPORT(char *) ap_get_token(pool *p, const char **accept_line, int accept_wh
 
     /* Find first non-white byte */
 
-    while (*ptr && ap_isspace(*ptr))
+    while (ap_isspace(*ptr))
 	++ptr;
 
     tok_start = ptr;
@@ -1336,7 +1336,7 @@ API_EXPORT(char *) ap_get_token(pool *p, const char **accept_line, int accept_wh
 
     /* Advance accept_line pointer to the next non-white byte */
 
-    while (*ptr && ap_isspace(*ptr))
+    while (ap_isspace(*ptr))
 	++ptr;
 
     *accept_line = ptr;
diff --git a/usr.sbin/httpd/src/main/util_date.c b/usr.sbin/httpd/src/main/util_date.c
index b4324dad7db..f237279864e 100644
--- a/usr.sbin/httpd/src/main/util_date.c
+++ b/usr.sbin/httpd/src/main/util_date.c
@@ -232,7 +232,7 @@ API_EXPORT(time_t) ap_parseHTTPdate(const char *date)
     if (!date)
 	return BAD_DATE;
 
-    while (*date && ap_isspace(*date))	/* Find first non-whitespace char */
+    while (ap_isspace(*date))			/* Find first non-whitespace char */
 	++date;
 
     if (*date == '\0')
diff --git a/usr.sbin/httpd/src/main/util_script.c b/usr.sbin/httpd/src/main/util_script.c
index 1b5d2a2758d..7029c1f6e73 100644
--- a/usr.sbin/httpd/src/main/util_script.c
+++ b/usr.sbin/httpd/src/main/util_script.c
@@ -504,7 +504,7 @@ API_EXPORT(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
 	}
 
 	*l++ = '\0';
-	while (*l && ap_isspace(*l)) {
+	while (ap_isspace(*l)) {
 	    ++l;
 	}
 
diff --git a/usr.sbin/httpd/src/modules/proxy/proxy_cache.c b/usr.sbin/httpd/src/modules/proxy/proxy_cache.c
index 04d1d66b44f..46cded628a6 100644
--- a/usr.sbin/httpd/src/modules/proxy/proxy_cache.c
+++ b/usr.sbin/httpd/src/modules/proxy/proxy_cache.c
@@ -997,7 +997,7 @@ int ap_proxy_cache_check(request_rec *r, char *url, struct cache_conf * conf,
             /* isolate header name */
             while (*vary && !ap_isspace(*vary) && (*vary != ','))
                 ++vary;
-            while (*vary && (ap_isspace(*vary) || (*vary == ','))) {
+            while (ap_isspace(*vary) || (*vary == ',')) {
                 *vary = '\0';
                 ++vary;
             }
diff --git a/usr.sbin/httpd/src/modules/proxy/proxy_util.c b/usr.sbin/httpd/src/modules/proxy/proxy_util.c
index a246f0e9f7c..08a53579c9e 100644
--- a/usr.sbin/httpd/src/modules/proxy/proxy_util.c
+++ b/usr.sbin/httpd/src/modules/proxy/proxy_util.c
@@ -1373,7 +1373,7 @@ void ap_proxy_clear_connection(pool *p, table *headers)
             name = next;
             while (*next && !ap_isspace(*next) && (*next != ','))
                 ++next;
-            while (*next && (ap_isspace(*next) || (*next == ','))) {
+            while (ap_isspace(*next) || (*next == ',')) {
                 *next = '\0';
                 ++next;
             }
diff --git a/usr.sbin/httpd/src/modules/standard/mod_imap.c b/usr.sbin/httpd/src/modules/standard/mod_imap.c
index 145deeaea70..c9bdea6e69e 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_imap.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_imap.c
@@ -699,7 +699,7 @@ static int imap_handler(request_rec *r)
 	if (!*string_pos) {		/* need at least two fields */
 	    goto need_2_fields;
 	}
-	while(*string_pos && ap_isspace(*string_pos)) { /* past whitespace */
+	while(ap_isspace(*string_pos)) { /* past whitespace */
 	    ++string_pos;
 	}
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_negotiation.c b/usr.sbin/httpd/src/modules/standard/mod_negotiation.c
index 2455462fd65..4e68d887d55 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_negotiation.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_negotiation.c
@@ -369,7 +369,7 @@ static const char *get_entry(pool *p, accept_rec *result,
         }
 
         *cp++ = '\0';           /* Delimit var */
-        while (*cp && (ap_isspace(*cp) || *cp == '=')) {
+        while (ap_isspace(*cp) || *cp == '=') {
             ++cp;
         }
 
@@ -652,7 +652,7 @@ static enum header_state get_header_line(char *buffer, int len, FILE *map)
 
     /* If blank, just return it --- this ends information on this variant */
 
-    for (cp = buffer; (*cp && ap_isspace(*cp)); ++cp) {
+    for (cp = buffer; ap_isspace(*cp); ++cp) {
         continue;
     }
 
@@ -758,7 +758,7 @@ static char *lcase_header_name_return_body(char *header, request_rec *r)
 
     do {
         ++cp;
-    } while (*cp && ap_isspace(*cp));
+    } while (ap_isspace(*cp));
 
     if (!*cp) {
         ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,