- Change register_internal_class to zend_register_internal_class for

- consistency.
- Andrei: I'm still thinking about the _ex you want me to implement

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index e0040713c41cd2f93ad775f6e907e8ae348d0d68..8e28c9ddb150710cc054c2470f148841f21f631d 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -868,7 +868,7 @@ int zend_next_free_module(void)
 }
 
 
-ZEND_API zend_class_entry *register_internal_class(zend_class_entry *class_entry)
+ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry)
 {
        zend_class_entry *register_class;
        char *lowercase_name = zend_strndup(class_entry->name, class_entry->name_length);

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 9a19bf21e6a7adab8172e94d9e495020e36d5f5a..2345ef023af0be5af6b086cf46a000f354a8e234 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -111,7 +111,7 @@ ZEND_API int ParameterPassedByReference(int ht, uint n);
 int zend_register_functions(zend_function_entry *functions, HashTable *function_table);
 void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table);
 ZEND_API int zend_register_module(zend_module_entry *module_entry);
-ZEND_API zend_class_entry *register_internal_class(zend_class_entry *class_entry);
+ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry);
 ZEND_API zend_module_entry *zend_get_module(int module_number);
 ZEND_API int zend_disable_function(char *function_name, uint function_name_length);
 

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index e2e3c5facd2162cf09c506d1df71381b7da96acd..10bb648bc1e8fb98990458dd3688a0d93ffd2ea4 100644 (file)
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -134,11 +134,11 @@ PHP_MINIT_FUNCTION(domxml)
        INIT_CLASS_ENTRY(domxmlattr_class_entry, "DomAttribute", php_domxmlattr_class_functions);
        INIT_CLASS_ENTRY(domxmlns_class_entry, "DomNamespace", php_domxmlns_class_functions);
 
-       domxmldoc_class_entry_ptr = register_internal_class(&domxmldoc_class_entry);
-       domxmldtd_class_entry_ptr = register_internal_class(&domxmldtd_class_entry);
-       domxmlnode_class_entry_ptr = register_internal_class(&domxmlnode_class_entry);
-       domxmlattr_class_entry_ptr = register_internal_class(&domxmlattr_class_entry);
-       domxmlns_class_entry_ptr = register_internal_class(&domxmlns_class_entry);
+       domxmldoc_class_entry_ptr = zend_register_internal_class(&domxmldoc_class_entry);
+       domxmldtd_class_entry_ptr = zend_register_internal_class(&domxmldtd_class_entry);
+       domxmlnode_class_entry_ptr = zend_register_internal_class(&domxmlnode_class_entry);
+       domxmlattr_class_entry_ptr = zend_register_internal_class(&domxmlattr_class_entry);
+       domxmlns_class_entry_ptr = zend_register_internal_class(&domxmlns_class_entry);
 
        REGISTER_LONG_CONSTANT("XML_ELEMENT_NODE", XML_ELEMENT_NODE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("XML_ATTRIBUTE_NODE", XML_ATTRIBUTE_NODE, CONST_CS | CONST_PERSISTENT);
@@ -292,7 +292,7 @@ void domxmltestnode_class_startup()
                                                                domxmltestnode_class_get_property,
                                                                domxmltestnode_class_set_property);
 
-       domxmltestnode_class_entry_ptr = register_internal_class(&domxmltestnode_class_entry);
+       domxmltestnode_class_entry_ptr = zend_register_internal_class(&domxmltestnode_class_entry);
 }
 #endif 
 

diff --git a/ext/java/java.c b/ext/java/java.c
index 94246b15d489d62b38b75f6d59eb49a279720783..5865b583a779f59bf0eac67c143c6d494fa2c225 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -452,7 +452,7 @@ PHP_MINIT_FUNCTION(java) {
     java_get_property_handler,
     java_set_property_handler);
 
-  register_internal_class(&java_class_entry);
+  zend_register_internal_class(&java_class_entry);
 
   le_jobject = register_list_destructors(_php_java_destructor,NULL);
 

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 5f427d78353756263f91a39184e4bb1b6cb51e4c..f12a9e2d50d74eb8d62ec27228e7d385eb88d0b4 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -367,7 +367,7 @@ PHP_MINIT_FUNCTION(oci)
 
        INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI-Lob", php_oci_lob_class_functions);
 
-       oci_lob_class_entry_ptr = register_internal_class(&oci_lob_class_entry);
+       oci_lob_class_entry_ptr = zend_register_internal_class(&oci_lob_class_entry);
 
 /* thies@digicol.de 990203 i do not think that we will need all of them - just in here for completeness for now! */
        REGISTER_LONG_CONSTANT("OCI_DEFAULT",OCI_DEFAULT, CONST_CS | CONST_PERSISTENT);

diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c
index f20d812bfa7da71a5be466a26568a1286abec7db..28d8b488175730f7e1706f849e9b701922d52bac 100644 (file)
--- a/ext/rpc/com/COM.c
+++ b/ext/rpc/com/COM.c
@@ -972,7 +972,7 @@ void php_register_COM_class()
                                                                php_COM_get_property_handler,
                                                                php_COM_set_property_handler);
 
-       register_internal_class(&com_class_entry);
+       zend_register_internal_class(&com_class_entry);
 }
 
 

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 94246b15d489d62b38b75f6d59eb49a279720783..5865b583a779f59bf0eac67c143c6d494fa2c225 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -452,7 +452,7 @@ PHP_MINIT_FUNCTION(java) {
     java_get_property_handler,
     java_set_property_handler);
 
-  register_internal_class(&java_class_entry);
+  zend_register_internal_class(&java_class_entry);
 
   le_jobject = register_list_destructors(_php_java_destructor,NULL);
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 59a7e0c6a7dc696eab5b0c63a71c34d44e1a3be2..c8dd78d9715f0ee0061513cd3b49964d24fd85a3 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1702,7 +1702,7 @@ void test_class_startup()
                                                                test_class_get_property,
                                                                test_class_set_property);
 
-       register_internal_class(&test_class_entry);
+       zend_register_internal_class(&test_class_entry);
 }
 
 /* {{{ proto string ini_get(string varname)

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 799bb4465923d2cb4aa9a3a5f8c78a94d596694d..73f9cb8f9a1cf5ed4f306a04189f15124d0568c5 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -109,7 +109,7 @@ PHP_MINIT_FUNCTION(dir)
        le_dirp = register_list_destructors(_dir_dtor,NULL);
 
        INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions);
-       dir_class_entry_ptr = register_internal_class(&dir_class_entry);
+       dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry);
 
 #ifdef ZTS
        dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), (ts_allocate_ctor) php_dir_init_globals, NULL);