Moving some functions into Zend.

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 3809368ce1664d159883e38643d2bbcf793c4442..0a03a72f0a01e150207a193093d46eb6a70c5b10 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -60,6 +60,10 @@ static ZEND_FUNCTION(get_defined_functions);
 static ZEND_FUNCTION(get_defined_vars);
 static ZEND_FUNCTION(create_function);
 static ZEND_FUNCTION(get_resource_type);
+static ZEND_FUNCTION(get_loaded_extensions);
+static ZEND_FUNCTION(extension_loaded);
+static ZEND_FUNCTION(get_extension_funcs);
+static ZEND_FUNCTION(get_defined_constants);
 #if ZEND_DEBUG
 static ZEND_FUNCTION(zend_test_func);
 #endif
@@ -107,6 +111,10 @@ static zend_function_entry builtin_functions[] = {
        ZEND_FE(get_defined_vars,       NULL)
        ZEND_FE(create_function,        NULL)
        ZEND_FE(get_resource_type,      NULL)
+       ZEND_FE(get_loaded_extensions,          NULL)
+       ZEND_FE(extension_loaded,                       NULL)
+       ZEND_FE(get_extension_funcs,            NULL)
+       ZEND_FE(get_defined_constants,          NULL)
 #if ZEND_DEBUG
        ZEND_FE(zend_test_func,         NULL)
 #endif
@@ -996,3 +1004,92 @@ ZEND_FUNCTION(get_resource_type)
                RETURN_STRING("Unknown", 1);
        }
 }
+
+
+static int add_extension_info(zend_module_entry *module, void *arg)
+{
+       zval *name_array = (zval *)arg;
+       add_next_index_string(name_array, module->name, 1);
+       return 0;
+}
+
+static int add_constant_info(zend_constant *constant, void *arg)
+{
+       zval *name_array = (zval *)arg;
+       add_assoc_zval(name_array, constant->name, &(constant->value));
+       return 0;
+}
+
+/* {{{ proto array get_loaded_extensions(void)
+   Return an array containing names of loaded extensions */
+ZEND_FUNCTION(get_loaded_extensions)
+{
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+
+       array_init(return_value);
+       zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void*)) add_extension_info, return_value);
+}
+/* }}} */
+
+
+/* {{{ proto array get_defined_constants(void)
+   Return an array containing the names and values of all defined constants */
+ZEND_FUNCTION(get_defined_constants)
+{
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+
+       array_init(return_value);
+       zend_hash_apply_with_argument(EG(zend_constants), (int (*)(void *, void*)) add_constant_info, return_value);
+}
+
+
+/* {{{ proto bool extension_loaded(string extension_name)
+   Returns true if the named extension is loaded */
+ZEND_FUNCTION(extension_loaded)
+{
+       zval **extension_name;
+
+       if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &extension_name)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(extension_name);
+       if (zend_hash_exists(&module_registry, Z_STRVAL_PP(extension_name), Z_STRLEN_PP(extension_name)+1)) {
+               RETURN_TRUE;
+       } else {
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
+
+/* {{{ proto array get_extension_funcs(string extension_name)
+   Returns an array with the names of functions belonging to the named extension */
+ZEND_FUNCTION(get_extension_funcs)
+{
+       zval **extension_name;
+       zend_module_entry *module;
+       zend_function_entry *func;
+
+       if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &extension_name)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(extension_name);
+       if (zend_hash_find(&module_registry, Z_STRVAL_PP(extension_name),
+                                          Z_STRLEN_PP(extension_name)+1, (void**)&module) == FAILURE) {
+               return;
+       }
+
+       array_init(return_value);
+       func = module->functions;
+       while (func->fname) {
+               add_next_index_string(return_value, func->fname, 1);
+               func++;
+       }
+}
+/* }}} */

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 45f12dbfd07abf929302b97cfe132e00f22456b0..7ec8294132be044cfbd293fe57353a59739b0673 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -379,11 +379,6 @@ function_entry basic_functions[] = {
        PHP_FE(connection_status,                       NULL)
        PHP_FE(ignore_user_abort,                       NULL)
 
-       PHP_FE(get_loaded_extensions,           NULL)
-       PHP_FE(extension_loaded,                        NULL)
-       PHP_FE(get_extension_funcs,                     NULL)
-       PHP_FE(get_defined_constants,                   NULL)
-
        PHP_FE(parse_ini_file,                          NULL)
 
        PHP_FE(is_uploaded_file,                        NULL)
@@ -2359,92 +2354,6 @@ PHP_FUNCTION(getprotobynumber)
 /* }}} */
 
 
-static int php_add_extension_info(zend_module_entry *module, void *arg)
-{
-       zval *name_array = (zval *)arg;
-       add_next_index_string(name_array, module->name, 1);
-       return 0;
-}
-
-static int php_add_constant_info(zend_constant *constant, void *arg)
-{
-       zval *name_array = (zval *)arg;
-       add_assoc_zval(name_array, constant->name, &(constant->value));
-       return 0;
-}
-
-/* {{{ proto array get_loaded_extensions(void)
-   Return an array containing names of loaded extensions */
-PHP_FUNCTION(get_loaded_extensions)
-{
-       if (ZEND_NUM_ARGS() != 0) {
-               WRONG_PARAM_COUNT;
-       }
-
-       array_init(return_value);
-       zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void*)) php_add_extension_info, return_value);
-}
-/* }}} */
-
-/* {{{ proto array get_defined_constants(void)
-   Return an array containing the names and values of all defined constants */
-PHP_FUNCTION(get_defined_constants)
-{
-       if (ZEND_NUM_ARGS() != 0) {
-               WRONG_PARAM_COUNT;
-       }
-
-       array_init(return_value);
-       zend_hash_apply_with_argument(EG(zend_constants), (int (*)(void *, void*)) php_add_constant_info, return_value);
-}
-
-/* {{{ proto bool extension_loaded(string extension_name)
-   Returns true if the named extension is loaded */
-PHP_FUNCTION(extension_loaded)
-{
-       zval **extension_name;
-
-       if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &extension_name)) {
-               WRONG_PARAM_COUNT;
-       }
-
-       convert_to_string_ex(extension_name);
-       if (zend_hash_exists(&module_registry, Z_STRVAL_PP(extension_name), Z_STRLEN_PP(extension_name)+1)) {
-               RETURN_TRUE;
-       } else {
-               RETURN_FALSE;
-       }
-}
-/* }}} */
-
-
-/* {{{ proto array get_extension_funcs(string extension_name)
-   Returns an array with the names of functions belonging to the named extension */
-PHP_FUNCTION(get_extension_funcs)
-{
-       zval **extension_name;
-       zend_module_entry *module;
-       zend_function_entry *func;
-
-       if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &extension_name)) {
-               WRONG_PARAM_COUNT;
-       }
-
-       convert_to_string_ex(extension_name);
-       if (zend_hash_find(&module_registry, Z_STRVAL_PP(extension_name),
-                                      Z_STRLEN_PP(extension_name)+1, (void**)&module) == FAILURE) {
-               return;
-       }
-
-       array_init(return_value);
-       func = module->functions;
-       while(func->fname) {
-               add_next_index_string(return_value, func->fname, 1);
-               func++;
-       }
-}
-/* }}} */
-
 /* {{{ proto void register_tick_function(string function_name [, mixed arg [, ... ]])
    Registers a tick callback function */
 PHP_FUNCTION(register_tick_function)

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 52c23a25e0b96d43a4a604320c8bb043decb7cd0..4169c7e70b9c08e102df09390d8549b345a38712 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -108,11 +108,6 @@ PHP_FUNCTION(getprotobynumber);
 
 PHP_NAMED_FUNCTION(php_if_crc32);
 
-PHP_FUNCTION(get_loaded_extensions);
-PHP_FUNCTION(extension_loaded);
-PHP_FUNCTION(get_extension_funcs);
-PHP_FUNCTION(get_defined_constants);
-
 PHP_FUNCTION(register_tick_function);
 PHP_FUNCTION(unregister_tick_function);