From c0667eeaff3c37af97056037b2c496da042eaa86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Thu, 2 Aug 2007 16:54:44 +0000 Subject: [PATCH] - MFH: Respect value of the parameter for get_loaded_extensions() and only print zend extensions if set to true --- Zend/tests/017.phpt | 8 +++++++- Zend/zend_builtin_functions.c | 23 ++++++----------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Zend/tests/017.phpt b/Zend/tests/017.phpt index bdf2ea7273..418b26e1e8 100644 --- a/Zend/tests/017.phpt +++ b/Zend/tests/017.phpt @@ -12,7 +12,9 @@ var_dump(get_resource_type($fp)); var_dump(gettype(get_loaded_extensions())); var_dump(count(get_loaded_extensions())); +var_dump(gettype(get_loaded_extensions(true))); var_dump(count(get_loaded_extensions(true))); +var_dump(get_loaded_extensions(true, true)); define("USER_CONSTANT", "test"); @@ -52,7 +54,11 @@ string(6) "stream" string(7) "Unknown" string(5) "array" int(%d) -int(2) +string(5) "array" +int(0) + +Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in /home/johannes/src/php/PHP_5_2/Zend/tests/017.php on line 14 +NULL Warning: Wrong parameter count for get_defined_constants() in %s on line %d NULL diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index e4fd10226f..ecdad68893 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1570,31 +1570,20 @@ static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC) } -/* {{{ proto array get_loaded_extensions([mixed categorize]) U +/* {{{ proto array get_loaded_extensions([bool zend_extensions]) U Return an array containing names of loaded extensions */ ZEND_FUNCTION(get_loaded_extensions) { - int argc = ZEND_NUM_ARGS(); + int zendext = 0; - if (argc != 0 && argc != 1) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &zendext) == FAILURE) { + return; } array_init(return_value); - if (argc) { - zval *modules; - zval *extensions; - - MAKE_STD_ZVAL(modules); - array_init(modules); - zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) add_extension_info, modules TSRMLS_CC); - add_assoc_zval_ex(return_value, "PHP Modules", sizeof("PHP Modules"), modules); - - MAKE_STD_ZVAL(extensions); - array_init(extensions); - zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) add_zendext_info, extensions TSRMLS_CC); - add_assoc_zval_ex(return_value, "Zend Extensions", sizeof("Zend Extensions"), extensions); + if (zendext) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) add_zendext_info, return_value TSRMLS_CC); } else { zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) add_extension_info, return_value TSRMLS_CC); } -- 2.40.0