Do not drop const qualifier

twose · twose · commit b4ad3cf32dc3 · 2020-06-08T02:46:17.000+08:00
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -793,7 +793,7 @@ static zend_always_inline zend_string *php_trim_int(zend_string *str, const char
 				}
 			}
 		} else {
-			php_charmask((unsigned char*)what, what_len, mask);
+			php_charmask((const unsigned char *) what, what_len, mask);
 
 			if (mode & 1) {
 				while (start != end) {
@@ -2720,7 +2720,7 @@ PHP_FUNCTION(ucwords)
 		RETURN_EMPTY_STRING();
 	}
 
-	php_charmask((unsigned char *)delims, delims_len, mask);
+	php_charmask((const unsigned char *) delims, delims_len, mask);
 
 	ZVAL_STRINGL(return_value, ZSTR_VAL(str), ZSTR_LEN(str));
 	r = Z_STRVAL_P(return_value);
@@ -3651,7 +3651,7 @@ PHPAPI zend_string *php_addcslashes_str(const char *str, size_t len, const char
 	size_t  newlen;
 	zend_string *new_str = zend_string_safe_alloc(4, len, 0, 0);
 
-	php_charmask((unsigned char *)what, wlength, flags);
+	php_charmask((const unsigned char *) what, wlength, flags);
 
 	for (source = str, end = source + len, target = ZSTR_VAL(new_str); source < end; source++) {
 		c = *source;
@@ -5909,7 +5909,7 @@ PHP_FUNCTION(str_word_count)
 	}
 
 	if (char_list) {
-		php_charmask((unsigned char *)char_list, char_list_len, ch);
+		php_charmask((const unsigned char *) char_list, char_list_len, ch);
 	}
 
 	p = ZSTR_VAL(str);
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
@@ -758,9 +758,9 @@ static inline int php_url_scanner_add_var_impl(const char *name, size_t name_len
 		smart_str_appendl(&sname, ZSTR_VAL(encoded), ZSTR_LEN(encoded)); zend_string_free(encoded);
 		encoded = php_raw_url_encode(value, value_len);
 		smart_str_appendl(&svalue, ZSTR_VAL(encoded), ZSTR_LEN(encoded)); zend_string_free(encoded);
-		encoded = php_escape_html_entities_ex((unsigned char*)name, name_len, 0, ENT_QUOTES|ENT_SUBSTITUTE, NULL, /* double_encode */ 0, /* quiet */ 1);
+		encoded = php_escape_html_entities_ex((const unsigned char *) name, name_len, 0, ENT_QUOTES|ENT_SUBSTITUTE, NULL, /* double_encode */ 0, /* quiet */ 1);
 		smart_str_appendl(&hname, ZSTR_VAL(encoded), ZSTR_LEN(encoded)); zend_string_free(encoded);
-		encoded = php_escape_html_entities_ex((unsigned char*)value, value_len, 0, ENT_QUOTES|ENT_SUBSTITUTE, NULL, /* double_encode */ 0, /* quiet */ 1);
+		encoded = php_escape_html_entities_ex((const unsigned char *) value, value_len, 0, ENT_QUOTES|ENT_SUBSTITUTE, NULL, /* double_encode */ 0, /* quiet */ 1);
 		smart_str_appendl(&hvalue, ZSTR_VAL(encoded), ZSTR_LEN(encoded)); zend_string_free(encoded);
 	} else {
 		smart_str_appendl(&sname, name, name_len);
@@ -860,7 +860,7 @@ static inline int php_url_scanner_reset_var_impl(zend_string *name, int encode,
 		encoded = php_raw_url_encode(ZSTR_VAL(name), ZSTR_LEN(name));
 		smart_str_appendl(&sname, ZSTR_VAL(encoded), ZSTR_LEN(encoded));
 		zend_string_free(encoded);
-		encoded = php_escape_html_entities_ex((unsigned char *)ZSTR_VAL(name), ZSTR_LEN(name), 0, ENT_QUOTES|ENT_SUBSTITUTE, SG(default_charset), /* double_encode */ 0, /* quiet */ 1);
+		encoded = php_escape_html_entities_ex((const unsigned char *) ZSTR_VAL(name), ZSTR_LEN(name), 0, ENT_QUOTES|ENT_SUBSTITUTE, SG(default_charset), /* double_encode */ 0, /* quiet */ 1);
 		smart_str_appendl(&hname, ZSTR_VAL(encoded), ZSTR_LEN(encoded));
 		zend_string_free(encoded);
 	} else {
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -1979,7 +1979,7 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server
 	php_cli_server_content_sender_ctor(&client->content_sender);
 	client->content_sender_initialized = 1;
 
-	escaped_request_uri = php_escape_html_entities_ex((unsigned char *)client->request.request_uri, client->request.request_uri_len, 0, ENT_QUOTES, NULL, /* double_encode */ 0, /* quiet */ 0);
+	escaped_request_uri = php_escape_html_entities_ex((const unsigned char *) client->request.request_uri, client->request.request_uri_len, 0, ENT_QUOTES, NULL, /* double_encode */ 0, /* quiet */ 0);
 
 	{
 		static const char prologue_template[] = "<!doctype html><html><head><title>%d %s</title>";
diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
@@ -488,7 +488,7 @@ int fpm_status_handle_request(void) /* {{{ */
 					if (!encode) {
 						query_string = proc.query_string;
 					} else {
-						tmp_query_string = php_escape_html_entities_ex((unsigned char *)proc.query_string, strlen(proc.query_string), 1, ENT_HTML_IGNORE_ERRORS & ENT_COMPAT, NULL, /* double_encode */ 1, /* quiet */ 0);
+						tmp_query_string = php_escape_html_entities_ex((const unsigned char *) proc.query_string, strlen(proc.query_string), 1, ENT_HTML_IGNORE_ERRORS & ENT_COMPAT, NULL, /* double_encode */ 1, /* quiet */ 0);
 						query_string = ZSTR_VAL(tmp_query_string);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ static zend_always_inline zend_string php_trim_int(zend_string str, const char`
`793`	`793`	`}`
`794`	`794`	`}`
`795`	`795`	`} else {`
`796`		`- php_charmask((unsigned char*)what, what_len, mask);`
	`796`	`+ php_charmask((const unsigned char *) what, what_len, mask);`
`797`	`797`
`798`	`798`	`if (mode & 1) {`
`799`	`799`	`while (start != end) {`
`@@ -2720,7 +2720,7 @@ PHP_FUNCTION(ucwords)`
`2720`	`2720`	`RETURN_EMPTY_STRING();`
`2721`	`2721`	`}`
`2722`	`2722`
`2723`		`- php_charmask((unsigned char *)delims, delims_len, mask);`
	`2723`	`+ php_charmask((const unsigned char *) delims, delims_len, mask);`
`2724`	`2724`
`2725`	`2725`	`ZVAL_STRINGL(return_value, ZSTR_VAL(str), ZSTR_LEN(str));`
`2726`	`2726`	`r = Z_STRVAL_P(return_value);`
`@@ -3651,7 +3651,7 @@ PHPAPI zend_string php_addcslashes_str(const char str, size_t len, const char`
`3651`	`3651`	`size_t newlen;`
`3652`	`3652`	`zend_string *new_str = zend_string_safe_alloc(4, len, 0, 0);`
`3653`	`3653`
`3654`		`- php_charmask((unsigned char *)what, wlength, flags);`
	`3654`	`+ php_charmask((const unsigned char *) what, wlength, flags);`
`3655`	`3655`
`3656`	`3656`	`for (source = str, end = source + len, target = ZSTR_VAL(new_str); source < end; source++) {`
`3657`	`3657`	`c = *source;`
`@@ -5909,7 +5909,7 @@ PHP_FUNCTION(str_word_count)`
`5909`	`5909`	`}`
`5910`	`5910`
`5911`	`5911`	`if (char_list) {`
`5912`		`- php_charmask((unsigned char *)char_list, char_list_len, ch);`
	`5912`	`+ php_charmask((const unsigned char *) char_list, char_list_len, ch);`
`5913`	`5913`	`}`
`5914`	`5914`
`5915`	`5915`	`p = ZSTR_VAL(str);`
Original file line number	Diff line number	Diff line change
`@@ -1979,7 +1979,7 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server`
`1979`	`1979`	`php_cli_server_content_sender_ctor(&client->content_sender);`
`1980`	`1980`	`client->content_sender_initialized = 1;`
`1981`	`1981`
`1982`		`- escaped_request_uri = php_escape_html_entities_ex((unsigned char )client->request.request_uri, client->request.request_uri_len, 0, ENT_QUOTES, NULL, / double_encode / 0, / quiet */ 0);`
	`1982`	`+ escaped_request_uri = php_escape_html_entities_ex((const unsigned char ) client->request.request_uri, client->request.request_uri_len, 0, ENT_QUOTES, NULL, / double_encode / 0, / quiet */ 0);`
`1983`	`1983`
`1984`	`1984`	`{`
`1985`	`1985`	`static const char prologue_template[] = "<!doctype html><html><head><title>%d %s</title>";`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ int fpm_status_handle_request(void) /* {{{ */`
`488`	`488`	`if (!encode) {`
`489`	`489`	`query_string = proc.query_string;`
`490`	`490`	`} else {`
`491`		`- tmp_query_string = php_escape_html_entities_ex((unsigned char )proc.query_string, strlen(proc.query_string), 1, ENT_HTML_IGNORE_ERRORS & ENT_COMPAT, NULL, / double_encode / 1, / quiet */ 0);`
	`491`	`+ tmp_query_string = php_escape_html_entities_ex((const unsigned char ) proc.query_string, strlen(proc.query_string), 1, ENT_HTML_IGNORE_ERRORS & ENT_COMPAT, NULL, / double_encode / 1, / quiet */ 0);`
`492`	`492`	`query_string = ZSTR_VAL(tmp_query_string);`
`493`	`493`	`}`
`494`	`494`	`}`