- Remove backward dependency from PHP -> Zend

- Rename get_ini_entry() as get_configuration_directive() for clarity
  (it doesn't use the INI subsystem, but the module-supplied function for
  retrieving configuration directives)

1 files changed, 5 insertions, 5 deletions

diff --git a/Zend/zend.c b/Zend/zend.c
index b94d2ccf64..8fbb1f5f1d 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -52,7 +52,7 @@ ZEND_API void (*zend_ticks_function)(int ticks);
 ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 
 static void (*zend_message_dispatcher_p)(long message, void *data);
-static int (*zend_get_ini_entry_p)(char *name, uint name_length, zval *contents);
+static int (*zend_get_configuration_directive_p)(char *name, uint name_length, zval *contents);
 
 
 #ifdef ZTS
@@ -365,7 +365,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 	zend_message_dispatcher_p = utility_functions->message_handler;
 	zend_block_interruptions = utility_functions->block_interruptions;
 	zend_unblock_interruptions = utility_functions->unblock_interruptions;
-	zend_get_ini_entry_p = utility_functions->get_ini_entry;
+	zend_get_configuration_directive_p = utility_functions->get_configuration_directive;
 	zend_ticks_function = utility_functions->ticks_function;
 
 	zend_compile_file = compile_file;
@@ -554,10 +554,10 @@ ZEND_API void zend_message_dispatcher(long message, void *data)
 END_EXTERN_C()
 
 
-ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents)
+ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval *contents)
 {
-	if (zend_get_ini_entry_p) {
-		return zend_get_ini_entry_p(name, name_length, contents);
+	if (zend_get_configuration_directive_p) {
+		return zend_get_configuration_directive_p(name, name_length, contents);
 	} else {
 		return FAILURE;
 	}