Changeset 406

Timestamp:

05/31/2007 04:00:33 AM (18 months ago)

Author:

moo

Message:

merged [402] [403] [404] from trunk: s/origin_compile_file/old_compile_file/g and init global vars

Location:

branches/1.2

Files:

• . (modified) (1 prop)
• coverager.c (modified) (4 diffs)
• xcache.c (modified) (9 diffs)

branches/1.2/coverager.c

@@ -17 +17 @@
 
 static char *xc_coveragedump_dir = NULL;
-static zend_compile_file_t *origin_compile_file;
+static zend_compile_file_t *old_compile_file = NULL;
 
 #if 0
@@ -454 +454 @@
     zend_op_array *op_array;
 
-    op_array = origin_compile_file(h, type TSRMLS_CC);
+    op_array = old_compile_file(h, type TSRMLS_CC);
     if (op_array) {
         if (XG(coverager)) {
@@ -483 +483 @@
 int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */
 {
-    origin_compile_file = zend_compile_file;
+    old_compile_file = zend_compile_file;
     zend_compile_file = xc_compile_file_for_coverage;
 
@@ -503 +503 @@
 void xc_coverager_destroy() /* {{{ */
 {
-    if (origin_compile_file == xc_compile_file_for_coverage) {
-        zend_compile_file = origin_compile_file;
+    if (old_compile_file == xc_compile_file_for_coverage) {
+        zend_compile_file = old_compile_file;
     }
     if (xc_coveragedump_dir) {

branches/1.2/xcache.c

@@ -98 +98 @@
 
 static zend_bool xc_initized = 0;
-static zend_compile_file_t *origin_compile_file;
-static zend_llist_element  *xc_llist_zend_extension;
+static zend_compile_file_t *old_compile_file = NULL;
+static zend_llist_element  *xc_llist_zend_extension = NULL;
 
 static zend_bool xc_test = 0;
@@ -857 +857 @@
 
     if (!XG(cacher)) {
-        op_array = origin_compile_file(h, type TSRMLS_CC);
+        op_array = old_compile_file(h, type TSRMLS_CC);
 #ifdef HAVE_XCACHE_OPTIMIZER
         if (XG(optimizer)) {
@@ -876 +876 @@
     xce.data.php = &php;
     if (!xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC)) {
-        return origin_compile_file(h, type TSRMLS_CC);
+        return old_compile_file(h, type TSRMLS_CC);
     }
     cache = xce.cache;
@@ -884 +884 @@
     if (cache->compiling) {
         cache->clogs ++; /* is it safe here? */
-        return origin_compile_file(h, type TSRMLS_CC);
+        return old_compile_file(h, type TSRMLS_CC);
     }
 
@@ -925 +925 @@
     /* clogged */
     if (clogged) {
-        return origin_compile_file(h, type TSRMLS_CC);
+        return old_compile_file(h, type TSRMLS_CC);
     }
     /* }}} */
@@ -942 +942 @@
 
     zend_try {
-        op_array = origin_compile_file(h, type TSRMLS_CC);
+        op_array = old_compile_file(h, type TSRMLS_CC);
     } zend_catch {
         catched = 1;
@@ -1375 +1375 @@
     xc_shm_t *shm = NULL;
 
-    if (origin_compile_file) {
-        zend_compile_file = origin_compile_file;
-        origin_compile_file = NULL;
+    if (old_compile_file) {
+        zend_compile_file = old_compile_file;
+        old_compile_file = NULL;
     }
 
@@ -1419 +1419 @@
 
         if (xc_php_size) {
-            origin_compile_file = zend_compile_file;
+            old_compile_file = zend_compile_file;
             zend_compile_file = xc_compile_file;
 
@@ -2746 +2746 @@
 #endif
 /* }}} */
-static startup_func_t xc_last_ext_startup;
+static startup_func_t xc_last_ext_startup = NULL;
 static int xc_zend_startup_last(zend_extension *extension) /* {{{ */
 {