diff options
| author | Marcus Boerger <helly@php.net> | 2008-02-03 14:35:59 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-02-03 14:35:59 +0000 |
| commit | fa94dabd97f85e53dc8e67d1fbed67324b2b470d (patch) | |
| tree | 1d03db11d2a1310b429b5ae2cb13ac0ee947ab7f /ext | |
| parent | 1ecdaa388586c368b0fc489f80811b55bc894985 (diff) | |
| download | php-git-fa94dabd97f85e53dc8e67d1fbed67324b2b470d.tar.gz | |
- MFH Rename dump_config_hash() to get_config_hash() as it doesn't dump
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 18 | ||||
| -rw-r--r-- | ext/standard/basic_functions.h | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 13e822942c..d8539cd1cd 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -944,11 +944,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) @@ -3403,9 +3401,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) @@ -6233,18 +6229,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 874bf2b936..2b4ed9967d 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); |