diff options
| author | Jim Jagielski <jim@apache.org> | 2013-04-15 12:42:00 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2013-04-15 12:42:00 +0000 |
| commit | 9cfbdb0e6f441ad4621c563de78bd42e4abb9afd (patch) | |
| tree | 2ecaa08d2f59b4f3af54e8100711c4e21ff27a28 /server | |
| parent | 837d8db8da9b2b42a74de752b1c10a2e5d3213dd (diff) | |
| download | httpd-9cfbdb0e6f441ad4621c563de78bd42e4abb9afd.tar.gz | |
Merge r1452128 from trunk:
Remove useless tests.
Turn
if (*x && apr_isspace(*x))
into
if (apr_isspace(*x))
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1467980 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/util.c | 8 | ||||
| -rw-r--r-- | server/util_script.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/util.c b/server/util.c index 1d8359fcb7..87a7f29ce6 100644 --- a/server/util.c +++ b/server/util.c @@ -783,7 +783,7 @@ AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p, const char **line) char *res; char quote; - while (*str && apr_isspace(*str)) + while (apr_isspace(*str)) ++str; if (!*str) { @@ -815,7 +815,7 @@ AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p, const char **line) res = substring_conf(p, str, strend - str, 0); } - while (*strend && apr_isspace(*strend)) + while (apr_isspace(*strend)) ++strend; *line = strend; return res; @@ -1405,7 +1405,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool_t *p, const char **accept_line, /* Find first non-white byte */ - while (*ptr && apr_isspace(*ptr)) + while (apr_isspace(*ptr)) ++ptr; tok_start = ptr; @@ -1427,7 +1427,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool_t *p, const char **accept_line, /* Advance accept_line pointer to the next non-white byte */ - while (*ptr && apr_isspace(*ptr)) + while (apr_isspace(*ptr)) ++ptr; *accept_line = ptr; diff --git a/server/util_script.c b/server/util_script.c index 5708c08602..12a056f542 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -565,7 +565,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer, } *l++ = '\0'; - while (*l && apr_isspace(*l)) { + while (apr_isspace(*l)) { ++l; } |