Index: modules/proxy/mod_proxy_http.c
===================================================================
--- modules/proxy/mod_proxy_http.c	(revision 1243281)
+++ modules/proxy/mod_proxy_http.c	(working copy)
@@ -189,7 +189,7 @@ static int clear_conn_headers(void *data, const ch
         while (*next && !apr_isspace(*next) && (*next != ',')) {
             ++next;
         }
-        while (*next && (apr_isspace(*next) || (*next == ','))) {
+        while (apr_isspace(*next) || (*next == ',')) {
             *next++ = '\0';
         }
         apr_table_unset(headers, name);
Index: modules/cache/mod_cache_disk.c
===================================================================
--- modules/cache/mod_cache_disk.c	(revision 1243281)
+++ modules/cache/mod_cache_disk.c	(working copy)
@@ -825,7 +825,7 @@ static apr_status_t read_table(cache_handle_t *han
         }
 
         *l++ = '\0';
-        while (*l && apr_isspace(*l)) {
+        while (apr_isspace(*l)) {
             ++l;
         }
 
Index: modules/cache/mod_disk_cache.c
===================================================================
--- modules/cache/mod_disk_cache.c	(working copy)
+++ modules/cache/mod_disk_cache.c	(working copy)
@@ -748,7 +748,7 @@ static apr_status_t read_table(cache_handle_t *han
         }
 
         *l++ = '\0';
-        while (*l && apr_isspace(*l)) {
+        while (apr_isspace(*l)) {
             ++l;
         }
 
Index: modules/cache/cache_storage.c
===================================================================
--- modules/cache/cache_storage.c	(revision 1243281)
+++ modules/cache/cache_storage.c	(working copy)
@@ -263,7 +263,7 @@ int cache_select(cache_request_rec *cache, request
                 /* isolate header name */
                 while (*vary && !apr_isspace(*vary) && (*vary != ','))
                     ++vary;
-                while (*vary && (apr_isspace(*vary) || (*vary == ','))) {
+                while (apr_isspace(*vary) || (*vary == ',')) {
                     *vary = '\0';
                     ++vary;
                 }
Index: modules/mappers/mod_rewrite.c
===================================================================
--- modules/mappers/mod_rewrite.c	(revision 1243281)
+++ modules/mappers/mod_rewrite.c	(working copy)
@@ -1253,7 +1253,7 @@ static char *lookup_map_txtfile(request_rec *r, co
         }
 
         /* jump to the value */
-        while (*p && apr_isspace(*p)) {
+        while (apr_isspace(*p)) {
             ++p;
         }
 
Index: modules/mappers/mod_negotiation.c
===================================================================
--- modules/mappers/mod_negotiation.c	(revision 1243281)
+++ modules/mappers/mod_negotiation.c	(working copy)
@@ -366,7 +366,7 @@ static float atoq(const char *string)
         return  1.0f;
     }
 
-    while (*string && apr_isspace(*string)) {
+    while (apr_isspace(*string)) {
         ++string;
     }
 
@@ -464,7 +464,7 @@ static const char *get_entry(apr_pool_t *p, accept
         }
 
         *cp++ = '\0';           /* Delimit var */
-        while (*cp && (apr_isspace(*cp) || *cp == '=')) {
+        while (apr_isspace(*cp) || *cp == '=') {
             ++cp;
         }
 
@@ -757,7 +757,7 @@ static enum header_state get_header_line(char *buf
 
     /* If blank, just return it --- this ends information on this variant */
 
-    for (cp = buffer; (*cp && apr_isspace(*cp)); ++cp) {
+    for (cp = buffer; apr_isspace(*cp); ++cp) {
         continue;
     }
 
@@ -924,7 +924,7 @@ static char *lcase_header_name_return_body(char *h
 
     do {
         ++cp;
-    } while (*cp && apr_isspace(*cp));
+    } while (apr_isspace(*cp));
 
     if (!*cp) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00682)
Index: modules/mappers/mod_imagemap.c
===================================================================
--- modules/mappers/mod_imagemap.c	(revision 1243281)
+++ modules/mappers/mod_imagemap.c	(working copy)
@@ -676,7 +676,7 @@ static int imap_handler_internal(request_rec *r)
         if (!*string_pos) {   /* need at least two fields */
             goto need_2_fields;
         }
-        while(*string_pos && apr_isspace(*string_pos)) { /* past whitespace */
+        while(apr_isspace(*string_pos)) { /* past whitespace */
             ++string_pos;
         }
 
Index: modules/filters/mod_proxy_html.c
===================================================================
--- modules/filters/mod_proxy_html.c	(revision 1243281)
+++ modules/filters/mod_proxy_html.c	(working copy)
@@ -668,7 +668,7 @@ static meta *metafix(request_rec *r, const char *b
             if (p != NULL) {
                 while (*p) {
                     p += 7;
-                    while (*p && apr_isspace(*p))
+                    while (apr_isspace(*p))
                         ++p;
                     if (*p != '=')
                         continue;
Index: modules/metadata/mod_cern_meta.c
===================================================================
--- modules/metadata/mod_cern_meta.c	(revision 1243281)
+++ modules/metadata/mod_cern_meta.c	(working copy)
@@ -237,7 +237,7 @@ static int scan_meta_file(request_rec *r, apr_file
         }
 
         *l++ = '\0';
-        while (*l && apr_isspace(*l))
+        while (apr_isspace(*l))
             ++l;
 
         if (!strcasecmp(w, "Content-type")) {
Index: modules/metadata/mod_headers.c
===================================================================
--- modules/metadata/mod_headers.c	(revision 1243281)
+++ modules/metadata/mod_headers.c	(working copy)
@@ -700,7 +700,7 @@ static int do_headers_fixup(request_rec *r, apr_ta
                 while (*val) {
                     const char *tok_start;
 
-                    while (*val && apr_isspace(*val))
+                    while (apr_isspace(*val))
                         ++val;
 
                     tok_start = val;
Index: modules/metadata/mod_mime_magic.c
===================================================================
--- modules/metadata/mod_mime_magic.c	(revision 1243281)
+++ modules/metadata/mod_mime_magic.c	(working copy)
@@ -957,7 +957,7 @@ static int apprentice(server_rec *s, apr_pool_t *p
 
         /* skip leading whitespace */
         ws_offset = 0;
-        while (line[ws_offset] && apr_isspace(line[ws_offset])) {
+        while (apr_isspace(line[ws_offset])) {
             ws_offset++;
         }
 
Index: server/util.c
===================================================================
--- server/util.c	(revision 1243281)
+++ server/util.c	(working copy)
@@ -778,7 +778,7 @@ AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p,
     char *res;
     char quote;
 
-    while (*str && apr_isspace(*str))
+    while (apr_isspace(*str))
         ++str;
 
     if (!*str) {
@@ -810,7 +810,7 @@ AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p,
         res = substring_conf(p, str, strend - str, 0);
     }
 
-    while (*strend && apr_isspace(*strend))
+    while (apr_isspace(*strend))
         ++strend;
     *line = strend;
     return res;
@@ -1389,7 +1389,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool_t *p, con
 
     /* Find first non-white byte */
 
-    while (*ptr && apr_isspace(*ptr))
+    while (apr_isspace(*ptr))
         ++ptr;
 
     tok_start = ptr;
@@ -1411,7 +1411,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool_t *p, con
 
     /* Advance accept_line pointer to the next non-white byte */
 
-    while (*ptr && apr_isspace(*ptr))
+    while (apr_isspace(*ptr))
         ++ptr;
 
     *accept_line = ptr;
Index: server/util_script.c
===================================================================
--- server/util_script.c	(revision 1243281)
+++ server/util_script.c	(working copy)
@@ -565,7 +565,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(
         }
 
         *l++ = '\0';
-        while (*l && apr_isspace(*l)) {
+        while (apr_isspace(*l)) {
             ++l;
         }
 
Index: support/httxt2dbm.c
===================================================================
--- support/httxt2dbm.c	(revision 1243281)
+++ support/httxt2dbm.c	(working copy)
@@ -138,7 +138,7 @@ static apr_status_t to_dbm(apr_dbm_t *dbm, apr_fil
         dbmkey.dptr = apr_pstrmemdup(p, line,  c - line);
         dbmkey.dsize = (c - line);
 
-        while (*c && apr_isspace(*c)) {
+        while (apr_isspace(*c)) {
             ++c;
         }