Changeset beefac2 in git

Timestamp:

2007-05-31T03:21:02Z (13 years ago)

Author:

Xuefer <xuefer@…>

Branches:

3.0, 3.1, 3.2, master, trunk

Children:

9405bc5

Parents:

ed9329e

Message:

s/origin_compile_file/old_compile_file/g

git-svn-id: ​svn://svn.lighttpd.net/xcache/trunk@402 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:

• coverager.c (modified) (4 diffs)
• xcache.c (modified) (8 diffs)

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;
 
 #if 0
@@ -436 +436 @@
     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)) {
@@ -465 +465 @@
 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;
 
@@ -485 +485 @@
 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) {

xcache.c

@@ -87 +87 @@
 
 static zend_bool xc_initized = 0;
-static zend_compile_file_t *origin_compile_file;
+static zend_compile_file_t *old_compile_file;
 static zend_llist_element  *xc_llist_zend_extension;
 
@@ -975 +975 @@
 
     zend_try {
-        op_array = origin_compile_file(h, type TSRMLS_CC);
+        op_array = old_compile_file(h, type TSRMLS_CC);
     } zend_catch {
         catched = 1;
@@ -1181 +1181 @@
     TRACE("type = %d\n", h->type);
     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)) {
@@ -1195 +1195 @@
     if (xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC) != SUCCESS) {
         TRACE("failed to init key for %s", filename);
-        return origin_compile_file(h, type TSRMLS_CC);
+        return old_compile_file(h, type TSRMLS_CC);
     }
     cache = xce.cache;
@@ -1203 +1203 @@
     if (cache->compiling) {
         cache->clogs ++;
-        return origin_compile_file(h, type TSRMLS_CC);
+        return old_compile_file(h, type TSRMLS_CC);
     }
     /* {{{ entry_lookup/hit/md5_init/php_lookup */
@@ -1257 +1257 @@
     /* gaveup */
     if (gaveup) {
-        return origin_compile_file(h, type TSRMLS_CC);
+        return old_compile_file(h, type TSRMLS_CC);
     }
     /* }}} */
@@ -1561 +1561 @@
     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;
     }
 
@@ -1605 +1605 @@
 
         if (xc_php_size) {
-            origin_compile_file = zend_compile_file;
+            old_compile_file = zend_compile_file;
             zend_compile_file = xc_compile_file;