Add const modifier for name strings

mvorisek · nikic · commit f15b5ff3534f · 2020-02-13T14:44:06.000+01:00
Closes GH-5173.
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
@@ -390,7 +390,7 @@ ZEND_API int zend_restore_ini_entry(zend_string *name, int stage) /* {{{ */
 }
 /* }}} */
 
-ZEND_API int zend_ini_register_displayer(char *name, uint32_t name_length, void (*displayer)(zend_ini_entry *ini_entry, int type)) /* {{{ */
+ZEND_API int zend_ini_register_displayer(const char *name, uint32_t name_length, void (*displayer)(zend_ini_entry *ini_entry, int type)) /* {{{ */
 {
 	zend_ini_entry *ini_entry;
 
@@ -408,7 +408,7 @@ ZEND_API int zend_ini_register_displayer(char *name, uint32_t name_length, void
  * Data retrieval
  */
 
-ZEND_API zend_long zend_ini_long(char *name, size_t name_length, int orig) /* {{{ */
+ZEND_API zend_long zend_ini_long(const char *name, size_t name_length, int orig) /* {{{ */
 {
 	zend_ini_entry *ini_entry;
 
@@ -425,7 +425,7 @@ ZEND_API zend_long zend_ini_long(char *name, size_t name_length, int orig) /* {{
 }
 /* }}} */
 
-ZEND_API double zend_ini_double(char *name, size_t name_length, int orig) /* {{{ */
+ZEND_API double zend_ini_double(const char *name, size_t name_length, int orig) /* {{{ */
 {
 	zend_ini_entry *ini_entry;
 
@@ -442,7 +442,7 @@ ZEND_API double zend_ini_double(char *name, size_t name_length, int orig) /* {{{
 }
 /* }}} */
 
-ZEND_API char *zend_ini_string_ex(char *name, size_t name_length, int orig, zend_bool *exists) /* {{{ */
+ZEND_API char *zend_ini_string_ex(const char *name, size_t name_length, int orig, zend_bool *exists) /* {{{ */
 {
 	zend_ini_entry *ini_entry;
 
@@ -466,7 +466,7 @@ ZEND_API char *zend_ini_string_ex(char *name, size_t name_length, int orig, zend
 }
 /* }}} */
 
-ZEND_API char *zend_ini_string(char *name, size_t name_length, int orig) /* {{{ */
+ZEND_API char *zend_ini_string(const char *name, size_t name_length, int orig) /* {{{ */
 {
 	zend_bool exists = 1;
 	char *return_value;
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
@@ -81,14 +81,14 @@ ZEND_API int zend_alter_ini_entry_chars_ex(zend_string *name, const char *value,
 ZEND_API int zend_restore_ini_entry(zend_string *name, int stage);
 ZEND_API void display_ini_entries(zend_module_entry *module);
 
-ZEND_API zend_long zend_ini_long(char *name, size_t name_length, int orig);
-ZEND_API double zend_ini_double(char *name, size_t name_length, int orig);
-ZEND_API char *zend_ini_string(char *name, size_t name_length, int orig);
-ZEND_API char *zend_ini_string_ex(char *name, size_t name_length, int orig, zend_bool *exists);
+ZEND_API zend_long zend_ini_long(const char *name, size_t name_length, int orig);
+ZEND_API double zend_ini_double(const char *name, size_t name_length, int orig);
+ZEND_API char *zend_ini_string(const char *name, size_t name_length, int orig);
+ZEND_API char *zend_ini_string_ex(const char *name, size_t name_length, int orig, zend_bool *exists);
 ZEND_API zend_string *zend_ini_get_value(zend_string *name);
 ZEND_API zend_bool zend_ini_parse_bool(zend_string *str);
 
-ZEND_API int zend_ini_register_displayer(char *name, uint32_t name_length, void (*displayer)(zend_ini_entry *ini_entry, int type));
+ZEND_API int zend_ini_register_displayer(const char *name, uint32_t name_length, void (*displayer)(zend_ini_entry *ini_entry, int type));
 
 ZEND_API ZEND_INI_DISP(zend_ini_boolean_displayer_cb);
 ZEND_API ZEND_INI_DISP(zend_ini_color_displayer_cb);

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ ZEND_API int zend_restore_ini_entry(zend_string name, int stage) / {{{ */`
`390`	`390`	`}`
`391`	`391`	`/* }}} */`
`392`	`392`
`393`		`-ZEND_API int zend_ini_register_displayer(char name, uint32_t name_length, void (displayer)(zend_ini_entry ini_entry, int type)) / {{{ */`
	`393`	`+ZEND_API int zend_ini_register_displayer(const char name, uint32_t name_length, void (displayer)(zend_ini_entry ini_entry, int type)) / {{{ */`
`394`	`394`	`{`
`395`	`395`	`zend_ini_entry *ini_entry;`
`396`	`396`
`@@ -408,7 +408,7 @@ ZEND_API int zend_ini_register_displayer(char *name, uint32_t name_length, void`
`408`	`408`	`* Data retrieval`
`409`	`409`	`*/`
`410`	`410`
`411`		`-ZEND_API zend_long zend_ini_long(char name, size_t name_length, int orig) / {{{ */`
	`411`	`+ZEND_API zend_long zend_ini_long(const char name, size_t name_length, int orig) / {{{ */`
`412`	`412`	`{`
`413`	`413`	`zend_ini_entry *ini_entry;`
`414`	`414`
`@@ -425,7 +425,7 @@ ZEND_API zend_long zend_ini_long(char name, size_t name_length, int orig) / {{`
`425`	`425`	`}`
`426`	`426`	`/* }}} */`
`427`	`427`
`428`		`-ZEND_API double zend_ini_double(char name, size_t name_length, int orig) / {{{ */`
	`428`	`+ZEND_API double zend_ini_double(const char name, size_t name_length, int orig) / {{{ */`
`429`	`429`	`{`
`430`	`430`	`zend_ini_entry *ini_entry;`
`431`	`431`
`@@ -442,7 +442,7 @@ ZEND_API double zend_ini_double(char name, size_t name_length, int orig) / {{{`
`442`	`442`	`}`
`443`	`443`	`/* }}} */`
`444`	`444`
`445`		`-ZEND_API char zend_ini_string_ex(char name, size_t name_length, int orig, zend_bool exists) / {{{ */`
	`445`	`+ZEND_API char zend_ini_string_ex(const char name, size_t name_length, int orig, zend_bool exists) / {{{ */`
`446`	`446`	`{`
`447`	`447`	`zend_ini_entry *ini_entry;`
`448`	`448`
`@@ -466,7 +466,7 @@ ZEND_API char zend_ini_string_ex(char name, size_t name_length, int orig, zend`
`466`	`466`	`}`
`467`	`467`	`/* }}} */`
`468`	`468`
`469`		`-ZEND_API char zend_ini_string(char name, size_t name_length, int orig) /* {{{ */`
	`469`	`+ZEND_API char zend_ini_string(const char name, size_t name_length, int orig) /* {{{ */`
`470`	`470`	`{`
`471`	`471`	`zend_bool exists = 1;`
`472`	`472`	`char *return_value;`