From 964cb61f265e2e2b25bc59d1d7cec267f40d3ffc Mon Sep 17 00:00:00 2001 From: Jacob Champion Date: Wed, 21 Jun 2017 15:54:53 +0000 Subject: [PATCH] util.c: revert r1799375 during veto discussion https://lists.apache.org/thread.html/c0320136ae7e4cbbae03cb2636dfb9b693b2d7a6ffb4c9a645beadb9@%3Cdev.httpd.apache.org%3E git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799472 13f79535-47bb-0310-9956-ffa450edef68 --- server/util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/util.c b/server/util.c index 781493ed910..d302764e341 100644 --- a/server/util.c +++ b/server/util.c @@ -1526,7 +1526,7 @@ AP_DECLARE(const char *) ap_parse_token_list_strict(apr_pool_t *p, while (!string_end) { const unsigned char c = (unsigned char)*cur; - if (c && !TEST_CHAR(c, T_HTTP_TOKEN_STOP)) { + if (!TEST_CHAR(c, T_HTTP_TOKEN_STOP)) { /* Non-separator character; we are finished with leading * whitespace. We must never have encountered any trailing * whitespace before the delimiter (comma) */ @@ -1600,7 +1600,7 @@ AP_DECLARE(const char *) ap_parse_token_list_strict(apr_pool_t *p, */ AP_DECLARE(const char *) ap_scan_http_field_content(const char *ptr) { - for ( ; *ptr && !TEST_CHAR(*ptr, T_HTTP_CTRLS); ++ptr) ; + for ( ; !TEST_CHAR(*ptr, T_HTTP_CTRLS); ++ptr) ; return ptr; } @@ -1610,7 +1610,7 @@ AP_DECLARE(const char *) ap_scan_http_field_content(const char *ptr) */ AP_DECLARE(const char *) ap_scan_http_token(const char *ptr) { - for ( ; *ptr && !TEST_CHAR(*ptr, T_HTTP_TOKEN_STOP); ++ptr) ; + for ( ; !TEST_CHAR(*ptr, T_HTTP_TOKEN_STOP); ++ptr) ; return ptr; } @@ -1620,7 +1620,7 @@ AP_DECLARE(const char *) ap_scan_http_token(const char *ptr) */ AP_DECLARE(const char *) ap_scan_vchar_obstext(const char *ptr) { - for ( ; *ptr && TEST_CHAR(*ptr, T_VCHAR_OBSTEXT); ++ptr) ; + for ( ; TEST_CHAR(*ptr, T_VCHAR_OBSTEXT); ++ptr) ; return ptr; } -- 2.47.3