Remove unused import_used_extension utility value

nikic · nikic · commit 2a32c1cafdba · 2018-12-04T19:01:01.000+01:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1052,7 +1052,6 @@ void zend_shutdown(void) /* {{{ */
 void zend_set_utility_values(zend_utility_values *utility_values) /* {{{ */
 {
 	zend_uv = *utility_values;
-	zend_uv.import_use_extension_length = (uint32_t)strlen(zend_uv.import_use_extension);
 }
 /* }}} */
 
diff --git a/Zend/zend.h b/Zend/zend.h
@@ -206,8 +206,6 @@ typedef struct _zend_utility_functions {
 } zend_utility_functions;
 
 typedef struct _zend_utility_values {
-	char *import_use_extension;
-	uint32_t import_use_extension_length;
 	zend_bool html_errors;
 } zend_utility_values;
 
diff --git a/main/main.c b/main/main.c
@@ -2313,8 +2313,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	}
 
 	zuv.html_errors = 1;
-	zuv.import_use_extension = ".php";
-	zuv.import_use_extension_length = (uint32_t)strlen(zuv.import_use_extension);
 	php_startup_auto_globals();
 	zend_set_utility_values(&zuv);
 	php_startup_sapi_content_types();

Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,6 @@ void zend_shutdown(void) /* {{{ */`
`1052`	`1052`	`void zend_set_utility_values(zend_utility_values utility_values) / {{{ */`
`1053`	`1053`	`{`
`1054`	`1054`	`zend_uv = *utility_values;`
`1055`		`- zend_uv.import_use_extension_length = (uint32_t)strlen(zend_uv.import_use_extension);`
`1056`	`1055`	`}`
`1057`	`1056`	`/* }}} */`
`1058`	`1057`
Original file line number	Diff line number	Diff line change
`@@ -2313,8 +2313,6 @@ int php_module_startup(sapi_module_struct sf, zend_module_entry additional_mod`
`2313`	`2313`	`}`
`2314`	`2314`
`2315`	`2315`	`zuv.html_errors = 1;`
`2316`		`- zuv.import_use_extension = ".php";`
`2317`		`- zuv.import_use_extension_length = (uint32_t)strlen(zuv.import_use_extension);`
`2318`	`2316`	`php_startup_auto_globals();`
`2319`	`2317`	`zend_set_utility_values(&zuv);`
`2320`	`2318`	`php_startup_sapi_content_types();`