Changeset 88

Timestamp:

07/09/2006 12:47:31 PM (2 years ago)

Author:

moo

Message:

possible fix for #14 "Cannot redeclare ()"

Location:

trunk

Files:

• utils.c (modified) (2 diffs)
• utils.h (modified) (1 diff)
• xcache.h (modified) (1 diff)

trunk/utils.c

@@ -265 +265 @@
 #endif
 
-void xc_install_function(char *filename, zend_function *func, zend_uchar type, char *key, uint len TSRMLS_DC) /* {{{ */
+void xc_install_function(char *filename, zend_function *func, zend_uchar type, void *key, uint len TSRMLS_DC) /* {{{ */
 {
     if (func->type == ZEND_USER_FUNCTION) {
-        if (zend_u_hash_add(CG(function_table), type, key, len,
+        if (*(char *) key == '\0') {
+            zend_u_hash_update(CG(function_table), type, key, len,
+                        func, sizeof(zend_op_array),
+                        NULL
+                        );
+        }
+        else if (zend_u_hash_add(CG(function_table), type, key, len,
                     func, sizeof(zend_op_array),
                     NULL
@@ -285 +291 @@
     ZESW(void *stored_ce_ptr, NOTHING);
 
-    if (zend_u_hash_add(CG(class_table), type, key, len,
+    if (*(char *) key == '\0') {
+        zend_u_hash_update(CG(class_table), type, key, len,
+                    cest, sizeof(xc_cest_t),
+                    ZESW(&stored_ce_ptr, NULL)
+                    );
+    }
+    else if (zend_u_hash_add(CG(class_table), type, key, len,
                 cest, sizeof(xc_cest_t),
                 ZESW(&stored_ce_ptr, NULL)

trunk/utils.h

@@ -26 +26 @@
 
 /* installer */
-void xc_install_function(char *filename, zend_function *func, zend_uchar type, char *key, uint len TSRMLS_DC);
+void xc_install_function(char *filename, zend_function *func, zend_uchar type, void *key, uint len TSRMLS_DC);
 ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, zend_uchar type, void *key, uint len TSRMLS_DC);
 

trunk/xcache.h

@@ -78 +78 @@
        zend_hash_add(ht, arKey, nKeyLength, pData, nDataSize, pDest)
 
+#   define zend_u_hash_update(ht, type, arKey, nKeyLength, pData, nDataSize, pDest) \
+       zend_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest)
+
 #   define zend_u_hash_find(ht, type, arKey, nKeyLength, pData) \
        zend_hash_find(ht, arKey, nKeyLength, pData)