From: Anatol Belski <ab@php.net>
Date: Tue, 20 Mar 2018 10:12:25 +0000 (+0100)
Subject: Use const pointers
X-Git-Tag: php-7.3.0alpha1~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e106778f01ba09b3a0367af9713c9131be4e430;p=php

Use const pointers
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3e9fb1090a..68061b83ce 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -220,7 +220,7 @@ static int php_array_key_compare_string_case(const void *a, const void *b) /* {{
 {
 	Bucket *f = (Bucket *) a;
 	Bucket *s = (Bucket *) b;
-	char *s1, *s2;
+	const char *s1, *s2;
 	size_t l1, l2;
 	char buf1[MAX_LENGTH_OF_LONG + 1];
 	char buf2[MAX_LENGTH_OF_LONG + 1];
@@ -253,7 +253,7 @@ static int php_array_key_compare_string(const void *a, const void *b) /* {{{ */
 {
 	Bucket *f = (Bucket *) a;
 	Bucket *s = (Bucket *) b;
-	char *s1, *s2;
+	const char *s1, *s2;
 	size_t l1, l2;
 	char buf1[MAX_LENGTH_OF_LONG + 1];
 	char buf2[MAX_LENGTH_OF_LONG + 1];
@@ -286,7 +286,7 @@ static int php_array_key_compare_string_natural_general(const void *a, const voi
 {
 	Bucket *f = (Bucket *) a;
 	Bucket *s = (Bucket *) b;
-	char *s1, *s2;
+	const char *s1, *s2;
 	size_t l1, l2;
 	char buf1[MAX_LENGTH_OF_LONG + 1];
 	char buf2[MAX_LENGTH_OF_LONG + 1];
@@ -338,7 +338,7 @@ static int php_array_key_compare_string_locale(const void *a, const void *b) /*
 {
 	Bucket *f = (Bucket *) a;
 	Bucket *s = (Bucket *) b;
-	char *s1, *s2;
+	const char *s1, *s2;
 	char buf1[MAX_LENGTH_OF_LONG + 1];
 	char buf2[MAX_LENGTH_OF_LONG + 1];
 
@@ -1656,7 +1656,7 @@ PHP_FUNCTION(array_search)
 }
 /* }}} */
 
-static zend_always_inline int php_valid_var_name(char *var_name, size_t var_name_len) /* {{{ */
+static zend_always_inline int php_valid_var_name(const char *var_name, size_t var_name_len) /* {{{ */
 {
 #if 1
 	/* first 256 bits for first character, and second 256 bits for the next */
@@ -1713,7 +1713,7 @@ static zend_always_inline int php_valid_var_name(char *var_name, size_t var_name
 }
 /* }}} */
 
-PHPAPI int php_prefix_varname(zval *result, zval *prefix, char *var_name, size_t var_name_len, zend_bool add_underscore) /* {{{ */
+PHPAPI int php_prefix_varname(zval *result, const zval *prefix, const char *var_name, size_t var_name_len, zend_bool add_underscore) /* {{{ */
 {
 	ZVAL_NEW_STR(result, zend_string_alloc(Z_STRLEN_P(prefix) + (add_underscore ? 1 : 0) + var_name_len, 0));
 	memcpy(Z_STRVAL_P(result), Z_STRVAL_P(prefix), Z_STRLEN_P(prefix));
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 073aa017ef..39a6fe4e03 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -156,7 +156,7 @@ PHP_RSHUTDOWN_FUNCTION(browscap);
 /* Left for BC (not binary safe!) */
 PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers);
 PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, char *opt, char *headers);
-PHPAPI int php_prefix_varname(zval *result, zval *prefix, char *var_name, size_t var_name_len, zend_bool add_underscore);
+PHPAPI int php_prefix_varname(zval *result, const zval *prefix, const char *var_name, size_t var_name_len, zend_bool add_underscore);
 
 #define MT_N (624)