cvs: ZendEngine2 / zend_API.c

helly           Tue May 18 17:19:15 2004 EDT

  Modified files:              
    /ZendEngine2        zend_API.c 
  Log:
  - Need to operate on module pointer in hash table
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.254&r2=1.255&ty=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.254 ZendEngine2/zend_API.c:1.255
--- ZendEngine2/zend_API.c:1.254        Tue May 18 12:12:37 2004
+++ ZendEngine2/zend_API.c      Tue May 18 17:19:15 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.c,v 1.254 2004/05/18 16:12:37 stas Exp $ */
+/* $Id: zend_API.c,v 1.255 2004/05/18 21:19:15 helly Exp $ */
 
 #include "zend.h"
 #include "zend_execute.h"
@@ -1162,6 +1162,7 @@
 {
        int name_len;
        char *lcname;
+       zend_module_entry *module_ptr;
        
        if (!module) {
                return FAILURE;
@@ -1173,12 +1174,13 @@
        name_len = strlen(module->name);
        lcname = zend_str_tolower_dup(module->name, name_len);
 
-       if (zend_hash_add(&module_registry, lcname, name_len+1, (void *)module, 
sizeof(zend_module_entry), NULL)==FAILURE) {
+       if (zend_hash_add(&module_registry, lcname, name_len+1, (void *)module, 
sizeof(zend_module_entry), (void**)&module_ptr)==FAILURE) {
                zend_error(E_CORE_WARNING, "Module '%s' already loaded", 
module->name);
                efree(lcname);
                return FAILURE;
        }
        efree(lcname);
+       module = module_ptr;
 
        if (module->functions && zend_register_functions(NULL, 
module->functions, NULL, module->type TSRMLS_CC)==FAILURE) {
                zend_error(E_CORE_WARNING,"%s:  Unable to register functions, 
unable to load", module->name);

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php