Changeset 402


Ignore:
Timestamp:
2007-05-31T05:21:02+02:00 (8 years ago)
Author:
moo
Message:

s/origin_compile_file/old_compile_file/g

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/coverager.c

    r393 r402  
    1717 
    1818static char *xc_coveragedump_dir = NULL; 
    19 static zend_compile_file_t *origin_compile_file; 
     19static zend_compile_file_t *old_compile_file; 
    2020 
    2121#if 0 
     
    436436    zend_op_array *op_array; 
    437437 
    438     op_array = origin_compile_file(h, type TSRMLS_CC); 
     438    op_array = old_compile_file(h, type TSRMLS_CC); 
    439439    if (op_array) { 
    440440        if (XG(coverager)) { 
     
    465465int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */ 
    466466{ 
    467     origin_compile_file = zend_compile_file; 
     467    old_compile_file = zend_compile_file; 
    468468    zend_compile_file = xc_compile_file_for_coverage; 
    469469 
     
    485485void xc_coverager_destroy() /* {{{ */ 
    486486{ 
    487     if (origin_compile_file == xc_compile_file_for_coverage) { 
    488         zend_compile_file = origin_compile_file; 
     487    if (old_compile_file == xc_compile_file_for_coverage) { 
     488        zend_compile_file = old_compile_file; 
    489489    } 
    490490    if (xc_coveragedump_dir) { 
  • trunk/xcache.c

    r400 r402  
    8787 
    8888static zend_bool xc_initized = 0; 
    89 static zend_compile_file_t *origin_compile_file; 
     89static zend_compile_file_t *old_compile_file; 
    9090static zend_llist_element  *xc_llist_zend_extension; 
    9191 
     
    975975 
    976976    zend_try { 
    977         op_array = origin_compile_file(h, type TSRMLS_CC); 
     977        op_array = old_compile_file(h, type TSRMLS_CC); 
    978978    } zend_catch { 
    979979        catched = 1; 
     
    11811181    TRACE("type = %d\n", h->type); 
    11821182    if (!XG(cacher)) { 
    1183         op_array = origin_compile_file(h, type TSRMLS_CC); 
     1183        op_array = old_compile_file(h, type TSRMLS_CC); 
    11841184#ifdef HAVE_XCACHE_OPTIMIZER 
    11851185        if (XG(optimizer)) { 
     
    11951195    if (xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC) != SUCCESS) { 
    11961196        TRACE("failed to init key for %s", filename); 
    1197         return origin_compile_file(h, type TSRMLS_CC); 
     1197        return old_compile_file(h, type TSRMLS_CC); 
    11981198    } 
    11991199    cache = xce.cache; 
     
    12031203    if (cache->compiling) { 
    12041204        cache->clogs ++; 
    1205         return origin_compile_file(h, type TSRMLS_CC); 
     1205        return old_compile_file(h, type TSRMLS_CC); 
    12061206    } 
    12071207    /* {{{ entry_lookup/hit/md5_init/php_lookup */ 
     
    12571257    /* gaveup */ 
    12581258    if (gaveup) { 
    1259         return origin_compile_file(h, type TSRMLS_CC); 
     1259        return old_compile_file(h, type TSRMLS_CC); 
    12601260    } 
    12611261    /* }}} */ 
     
    15611561    xc_shm_t *shm = NULL; 
    15621562 
    1563     if (origin_compile_file) { 
    1564         zend_compile_file = origin_compile_file; 
    1565         origin_compile_file = NULL; 
     1563    if (old_compile_file) { 
     1564        zend_compile_file = old_compile_file; 
     1565        old_compile_file = NULL; 
    15661566    } 
    15671567 
     
    16051605 
    16061606        if (xc_php_size) { 
    1607             origin_compile_file = zend_compile_file; 
     1607            old_compile_file = zend_compile_file; 
    16081608            zend_compile_file = xc_compile_file; 
    16091609 
Note: See TracChangeset for help on using the changeset viewer.