From: Marcus Boerger <helly@php.net>
Date: Sun, 3 Feb 2008 14:35:29 +0000 (+0000)
Subject: - Rename dump_config_hash() to get_config_hash() as it doesn't dump
X-Git-Tag: RELEASE_2_0_0a1~645
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2ce43983fbad33732b0f37e31106708bb7f8ea7;p=php

- Rename dump_config_hash() to get_config_hash() as it doesn't dump
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 7cf04874be..3afc82c49c 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -943,11 +943,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_ini_file, 0, 0, 1)
 	ZEND_ARG_INFO(0, scanner_mode)
 ZEND_END_ARG_INFO()
 
-#if ZEND_DEBUG
 static
-ZEND_BEGIN_ARG_INFO(arginfo_dump_config_hash, 0)
+ZEND_BEGIN_ARG_INFO(arginfo_get_config_hash, 0)
 ZEND_END_ARG_INFO()
-#endif
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
@@ -3439,9 +3437,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(connection_status,												arginfo_connection_status)
 	PHP_FE(ignore_user_abort,												arginfo_ignore_user_abort)
 	PHP_FE(parse_ini_file,													arginfo_parse_ini_file)
-#if ZEND_DEBUG
-	PHP_FE(dump_config_hash,												arginfo_dump_config_hash)
-#endif
+	PHP_FE(get_config_hash,													arginfo_get_config_hash)
 	PHP_FE(is_uploaded_file,												arginfo_is_uploaded_file)
 	PHP_FE(move_uploaded_file,												arginfo_move_uploaded_file)
 
@@ -6340,18 +6336,16 @@ PHP_FUNCTION(parse_ini_file)
 }
 /* }}} */
 
-#if ZEND_DEBUG
-/* {{{ proto void dump_config_hash(void)
+/* {{{ proto array get_config_hash(void)
  */
-PHP_FUNCTION(dump_config_hash)
+PHP_FUNCTION(get_config_hash)
 {
-	HashTable hash = get_configuration_hash();
+	HashTable *hash = php_ini_get_configuration_hash();
 
 	array_init(return_value);
-	zend_hash_apply_with_arguments(&hash, (apply_func_args_t) add_config_entry_cb, 1, return_value TSRMLS_CC);
+	zend_hash_apply_with_arguments(hash, (apply_func_args_t) add_config_entry_cb, 1, return_value TSRMLS_CC);
 }
 /* }}} */
-#endif
 
 static int copy_request_variable(void *pDest, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
 {
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index c08d5f6f1b..3eb88f6787 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -125,9 +125,7 @@ PHP_FUNCTION(move_uploaded_file);
 
 /* From the INI parser */
 PHP_FUNCTION(parse_ini_file);
-#if ZEND_DEBUG
 PHP_FUNCTION(dump_config_hash);
-#endif
 
 PHP_FUNCTION(str_rot13);
 PHP_FUNCTION(stream_get_filters);
diff --git a/main/php_ini.c b/main/php_ini.c
index 35ef2d2c8b..9906a8f6f7 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -836,13 +836,10 @@ PHPAPI int cfg_get_string(char *varname, char **result)
 }
 /* }}} */
 
-#if ZEND_DEBUG
-#include "php_ini.h"
-PHPAPI HashTable get_configuration_hash(void)
+PHPAPI HashTable* php_ini_get_configuration_hash(void) /* {{{ */
 {
-	return configuration_hash;
-}
-#endif
+	return &configuration_hash;
+} /* }}} */
 
 /*
  * Local variables:
diff --git a/main/php_ini.h b/main/php_ini.h
index d69793ae93..b5b2b65677 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -36,9 +36,7 @@ PHPAPI int php_parse_user_ini_file(char *dirname, char *ini_filename, HashTable
 PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage TSRMLS_DC);
 PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC);
 PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len TSRMLS_DC);
-#if ZEND_DEBUG
-PHPAPI HashTable get_configuration_hash(void);
-#endif
+PHPAPI HashTable* php_in_get_configuration_hash(void);
 END_EXTERN_C()
 
 #define PHP_INI_USER	ZEND_INI_USER