You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2013/03/03 22:25:47 UTC
svn commit: r1452128 - in /httpd/httpd/trunk: modules/cache/
modules/filters/ modules/mappers/ modules/metadata/ server/ support/
Author: jailletc36
Date: Sun Mar 3 21:25:46 2013
New Revision: 1452128
URL: http://svn.apache.org/r1452128
Log:
Remove useless tests.
Turn
if (*x && apr_isspace(*x))
into
if (apr_isspace(*x))
Modified:
httpd/httpd/trunk/modules/cache/mod_cache_disk.c
httpd/httpd/trunk/modules/filters/mod_proxy_html.c
httpd/httpd/trunk/modules/mappers/mod_imagemap.c
httpd/httpd/trunk/modules/mappers/mod_negotiation.c
httpd/httpd/trunk/modules/mappers/mod_rewrite.c
httpd/httpd/trunk/modules/metadata/mod_cern_meta.c
httpd/httpd/trunk/modules/metadata/mod_headers.c
httpd/httpd/trunk/server/util.c
httpd/httpd/trunk/server/util_script.c
httpd/httpd/trunk/support/httxt2dbm.c
Modified: httpd/httpd/trunk/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_disk.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_disk.c Sun Mar 3 21:25:46 2013
@@ -841,7 +841,7 @@ static apr_status_t read_table(cache_han
}
*l++ = '\0';
- while (*l && apr_isspace(*l)) {
+ while (apr_isspace(*l)) {
++l;
}
Modified: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_proxy_html.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_proxy_html.c Sun Mar 3 21:25:46 2013
@@ -670,7 +670,7 @@ static meta *metafix(request_rec *r, con
if (p != NULL) {
while (*p) {
p += 7;
- while (*p && apr_isspace(*p))
+ while (apr_isspace(*p))
++p;
if (*p != '=')
continue;
Modified: httpd/httpd/trunk/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_imagemap.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_imagemap.c Sun Mar 3 21:25:46 2013
@@ -686,7 +686,7 @@ static int imap_handler_internal(request
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;
}
Modified: httpd/httpd/trunk/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_negotiation.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_negotiation.c Sun Mar 3 21:25:46 2013
@@ -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
}
*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
/* 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_bo
do {
++cp;
- } while (*cp && apr_isspace(*cp));
+ } while (apr_isspace(*cp));
if (!*cp) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00682)
Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Sun Mar 3 21:25:46 2013
@@ -1255,7 +1255,7 @@ static char *lookup_map_txtfile(request_
}
/* jump to the value */
- while (*p && apr_isspace(*p)) {
+ while (apr_isspace(*p)) {
++p;
}
Modified: httpd/httpd/trunk/modules/metadata/mod_cern_meta.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_cern_meta.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_cern_meta.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_cern_meta.c Sun Mar 3 21:25:46 2013
@@ -237,7 +237,7 @@ static int scan_meta_file(request_rec *r
}
*l++ = '\0';
- while (*l && apr_isspace(*l))
+ while (apr_isspace(*l))
++l;
if (!strcasecmp(w, "Content-type")) {
Modified: httpd/httpd/trunk/modules/metadata/mod_headers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_headers.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_headers.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_headers.c Sun Mar 3 21:25:46 2013
@@ -722,7 +722,7 @@ static int do_headers_fixup(request_rec
while (*val) {
const char *tok_start;
- while (*val && apr_isspace(*val))
+ while (apr_isspace(*val))
++val;
tok_start = val;
Modified: httpd/httpd/trunk/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util.c (original)
+++ httpd/httpd/trunk/server/util.c Sun Mar 3 21:25:46 2013
@@ -784,7 +784,7 @@ AP_DECLARE(char *) ap_getword_conf(apr_p
char *res;
char quote;
- while (*str && apr_isspace(*str))
+ while (apr_isspace(*str))
++str;
if (!*str) {
@@ -816,7 +816,7 @@ AP_DECLARE(char *) ap_getword_conf(apr_p
res = substring_conf(p, str, strend - str, 0);
}
- while (*strend && apr_isspace(*strend))
+ while (apr_isspace(*strend))
++strend;
*line = strend;
return res;
@@ -1406,7 +1406,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool
/* Find first non-white byte */
- while (*ptr && apr_isspace(*ptr))
+ while (apr_isspace(*ptr))
++ptr;
tok_start = ptr;
@@ -1428,7 +1428,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool
/* Advance accept_line pointer to the next non-white byte */
- while (*ptr && apr_isspace(*ptr))
+ while (apr_isspace(*ptr))
++ptr;
*accept_line = ptr;
Modified: httpd/httpd/trunk/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_script.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_script.c (original)
+++ httpd/httpd/trunk/server/util_script.c Sun Mar 3 21:25:46 2013
@@ -566,7 +566,7 @@ AP_DECLARE(int) ap_scan_script_header_er
}
*l++ = '\0';
- while (*l && apr_isspace(*l)) {
+ while (apr_isspace(*l)) {
++l;
}
Modified: httpd/httpd/trunk/support/httxt2dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/httxt2dbm.c?rev=1452128&r1=1452127&r2=1452128&view=diff
==============================================================================
--- httpd/httpd/trunk/support/httxt2dbm.c (original)
+++ httpd/httpd/trunk/support/httxt2dbm.c Sun Mar 3 21:25:46 2013
@@ -138,7 +138,7 @@ static apr_status_t to_dbm(apr_dbm_t *db
dbmkey.dptr = apr_pstrmemdup(p, line, c - line);
dbmkey.dsize = (c - line);
- while (*c && apr_isspace(*c)) {
+ while (apr_isspace(*c)) {
++c;
}