Show
Ignore:
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:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,400 to /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-404

  • branches/1.2/coverager.c

    r394 r406  
    1717 
    1818static char *xc_coveragedump_dir = NULL; 
    19 static zend_compile_file_t *origin_compile_file; 
     19static zend_compile_file_t *old_compile_file = NULL; 
    2020 
    2121#if 0 
    … …  
    454454    zend_op_array *op_array; 
    455455 
    456     op_array = origin_compile_file(h, type TSRMLS_CC); 
     456    op_array = old_compile_file(h, type TSRMLS_CC); 
    457457    if (op_array) { 
    458458        if (XG(coverager)) { 
    … …  
    483483int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */ 
    484484{ 
    485     origin_compile_file = zend_compile_file; 
     485    old_compile_file = zend_compile_file; 
    486486    zend_compile_file = xc_compile_file_for_coverage; 
    487487 
    … …  
    503503void xc_coverager_destroy() /* {{{ */ 
    504504{ 
    505     if (origin_compile_file == xc_compile_file_for_coverage) { 
    506         zend_compile_file = origin_compile_file; 
     505    if (old_compile_file == xc_compile_file_for_coverage) { 
     506        zend_compile_file = old_compile_file; 
    507507    } 
    508508    if (xc_coveragedump_dir) {