Changeset 593 for branches/1.3/utils.c

Timestamp:

07/05/2009 06:06:15 AM (4 years ago)

Author:

moo

Message:

merged r304,r305,r306,r307 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (4 diffs)

branches/1.3/utils.c

@@ -333 +333 @@
     zend_op *opline;
 
-#ifdef DEBUG
-    fprintf(stderr, "binding %d\n", oplineno);
-#endif
+    TRACE("binding %d", oplineno);
     assert(oplineno >= 0);
 
@@ -354 +352 @@
 
             parent_name = &(opline - 1)->op2.u.constant;
-#   ifdef DEBUG
-            fprintf(stderr, "binding with parent %s\n", Z_STRVAL_P(parent_name));
-#   endif
+            TRACE("binding with parent %s", Z_STRVAL_P(parent_name));
             if (zend_lookup_class(Z_STRVAL_P(parent_name), Z_STRLEN_P(parent_name), &pce TSRMLS_CC) == FAILURE) {
                 return FAILURE;
@@ -371 +367 @@
             zend_op *fetch_class_opline = opline - 1;
 
-#   ifdef DEBUG
-            fprintf(stderr, "%s %p\n", Z_STRVAL(fetch_class_opline->op2.u.constant), Z_STRVAL(fetch_class_opline->op2.u.constant));
-#   endif
+            TRACE("%s %p", Z_STRVAL(fetch_class_opline->op2.u.constant), Z_STRVAL(fetch_class_opline->op2.u.constant));
             OP_ZVAL_DTOR(fetch_class_opline->op2);
             fetch_class_opline->opcode = ZEND_NOP;
@@ -736 +730 @@
 }
 /* }}} */
+int xc_vtrace(const char *fmt, va_list args) /* {{{ */
+{
+    vfprintf(stderr, fmt, args);
+    return 0;
+}
+/* }}} */
+int xc_trace(const char *fmt, ...) /* {{{ */
+{
+    va_list args;
+
+    va_start(args, fmt);
+    xc_vtrace(fmt, args);
+    va_end(args);
+    return 0;
+}
+/* }}} */