Changeset 634 in svn for branches/1.3


Ignore:
Timestamp:
2009-07-05T09:47:17Z (6 years ago)
Author:
Xuefer
Message:

fix bad merge

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/utils.c

    r627 r634  
    528528#define OG(x) (sandbox->orig_##x)
    529529/* }}} */
    530 <<<<<<< .working
    531 =======
    532 #ifdef E_STRICT
    533 static void xc_sandbox_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) /* {{{ */
    534 {
    535     xc_compilererror_t *compilererror;
    536     xc_sandbox_t *sandbox;
    537     TSRMLS_FETCH();
    538 
    539     sandbox = (xc_sandbox_t *) XG(sandbox);
    540     assert(sandbox != NULL);
    541     if (type != E_STRICT) {
    542         /* give up, and user handler is not supported in this case */
    543         zend_uint i;
    544         zend_uint orig_lineno = CG(zend_lineno);
    545         zend_error_cb = sandbox->orig_zend_error_cb;
    546 
    547         for (i = 0; i < sandbox->compilererror_cnt; i ++) {
    548             compilererror = &sandbox->compilererrors[i];
    549             CG(zend_lineno) = compilererror->lineno;
    550             zend_error(E_STRICT, "%s", compilererror->error);
    551         }
    552         CG(zend_lineno) = orig_lineno;
    553         sandbox->compilererror_cnt = 0;
    554 
    555         sandbox->orig_zend_error_cb(type, error_filename, error_lineno, format, args);
    556         return;
    557     }
    558 
    559     if (sandbox->compilererror_cnt <= sandbox->compilererror_size) {
    560         if (sandbox->compilererror_size) {
    561             sandbox->compilererror_size += 16;
    562             sandbox->compilererrors = erealloc(sandbox->compilererrors, sandbox->compilererror_size * sizeof(sandbox->compilererrors));
    563         }
    564         else {
    565             sandbox->compilererror_size = 16;
    566             sandbox->compilererrors = emalloc(sandbox->compilererror_size * sizeof(sandbox->compilererrors));
    567         }
    568     }
    569     compilererror = &sandbox->compilererrors[sandbox->compilererror_cnt++];
    570     compilererror->lineno = error_lineno;
    571     compilererror->error_len = vspprintf(&compilererror->error, 0, format, args);
    572 }
    573 /* }}} */
    574 #endif
    575 >>>>>>> .merge-right.r559
    576530#ifdef ZEND_ENGINE_2_1
    577531static zend_bool xc_auto_global_callback(char *name, uint name_len TSRMLS_DC) /* {{{ */
  • branches/1.3/xcache.c

    r633 r634  
    895895}
    896896/* }}} */
    897 static inline xc_hash_value_t xc_php_hash_md5(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
    898 {
    899     return HASH_STR_S(php->md5, sizeof(php->md5));
    900 }
    901 /* }}} */
    902897#ifndef ZEND_COMPILE_DELAYED_BINDING
    903898static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
     
    999994            TRACE("found %s, catch it", stored_xce->name.str.val);
    1000995            xc_entry_hold_php_dmz(stored_xce TSRMLS_CC);
    1001             xc_cache_hit_dmz(cache);
     996            xc_cache_hit_dmz(cache TSRMLS_CC);
    1002997            break;
    1003998        }
Note: See TracChangeset for help on using the changeset viewer.