Changeset 593 for branches/1.3/utils.c


Ignore:
Timestamp:
2009-07-05T06:06:15+02:00 (5 years ago)
Author:
moo
Message:

merged r304,r305,r306,r307 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/utils.c

    r436 r593  
    333333    zend_op *opline; 
    334334 
    335 #ifdef DEBUG 
    336     fprintf(stderr, "binding %d\n", oplineno); 
    337 #endif 
     335    TRACE("binding %d", oplineno); 
    338336    assert(oplineno >= 0); 
    339337 
     
    354352 
    355353            parent_name = &(opline - 1)->op2.u.constant; 
    356 #   ifdef DEBUG 
    357             fprintf(stderr, "binding with parent %s\n", Z_STRVAL_P(parent_name)); 
    358 #   endif 
     354            TRACE("binding with parent %s", Z_STRVAL_P(parent_name)); 
    359355            if (zend_lookup_class(Z_STRVAL_P(parent_name), Z_STRLEN_P(parent_name), &pce TSRMLS_CC) == FAILURE) { 
    360356                return FAILURE; 
     
    371367            zend_op *fetch_class_opline = opline - 1; 
    372368 
    373 #   ifdef DEBUG 
    374             fprintf(stderr, "%s %p\n", Z_STRVAL(fetch_class_opline->op2.u.constant), Z_STRVAL(fetch_class_opline->op2.u.constant)); 
    375 #   endif 
     369            TRACE("%s %p", Z_STRVAL(fetch_class_opline->op2.u.constant), Z_STRVAL(fetch_class_opline->op2.u.constant)); 
    376370            OP_ZVAL_DTOR(fetch_class_opline->op2); 
    377371            fetch_class_opline->opcode = ZEND_NOP; 
     
    736730} 
    737731/* }}} */ 
     732int xc_vtrace(const char *fmt, va_list args) /* {{{ */ 
     733{ 
     734    vfprintf(stderr, fmt, args); 
     735    return 0; 
     736} 
     737/* }}} */ 
     738int xc_trace(const char *fmt, ...) /* {{{ */ 
     739{ 
     740    va_list args; 
     741 
     742    va_start(args, fmt); 
     743    xc_vtrace(fmt, args); 
     744    va_end(args); 
     745    return 0; 
     746} 
     747/* }}} */ 
Note: See TracChangeset for help on using the changeset viewer.