Changeset 305 for trunk/coverager.c

Timestamp:

12/08/2006 04:11:19 PM (2 years ago)

Author:

moo

Message:

TRACE() instead of ifdef/fprintf

Files:

• trunk/coverager.c (modified) (10 diffs)

trunk/coverager.c

@@ -27 +27 @@
 {
     coverager_t cov = *(coverager_t*) pDest;
-#ifdef DEBUG
-    fprintf(stderr, "destroy %p\n", cov);
-#endif
+    TRACE("destroy %p", cov);
     zend_hash_destroy(cov);
     efree(cov);
@@ -39 +37 @@
     struct stat st;
 
-#ifdef DEBUG
-    fprintf(stderr, "mkdirs %s %d %s %d\n", root, rootlen, path, pathlen);
-#endif
+    TRACE("mkdirs %s %d %s %d", root, rootlen, path, pathlen);
     fullpath = do_alloca(rootlen + pathlen + 1);
     memcpy(fullpath, root, rootlen);
@@ -56 +52 @@
             *chr = PHP_DIR_SEPARATOR;
         }
-#ifdef DEBUG
-        fprintf(stderr, "mkdir %s\n", fullpath);
-#endif
+        TRACE("mkdir %s", fullpath);
 #if PHP_MAJOR_VERSION > 5
         php_stream_mkdir(fullpath, 0700, REPORT_ERRORS, NULL);
@@ -113 +107 @@
 
     if (newfile) {
-#ifdef DEBUG
-        fprintf(stderr, "new file\n");
-#endif
+        TRACE("%s", "new file");
     }
     else if (outstat.st_size) {
@@ -123 +115 @@
             goto bailout;
         }
-#ifdef DEBUG
-        fprintf(stderr, "oldsize %d\n", (int) len);
-#endif
+        TRACE("oldsize %d", (int) len);
         do {
             p = (long *) contents;
@@ -133 +123 @@
             }
             if (*p++ != PCOV_HEADER_MAGIC) {
-#ifdef DEBUG
-                fprintf(stderr, "wrong magic in file %s\n", outfilename);
-#endif
+                TRACE("wrong magic in file %s", outfilename);
                 break;
             }
@@ -290 +278 @@
             strcpy(outfilename + dumpdir_len + size - 1, ".pcov");
 
-#ifdef DEBUG
-            fprintf(stderr, "outfilename %s\n", outfilename);
-#endif
+            TRACE("outfilename %s", outfilename);
             xc_coverager_save_cov(ZSTR_S(s), outfilename, *pcov TSRMLS_CC);
             zend_hash_move_forward_ex(XG(coverages), &pos);
@@ -354 +340 @@
 
     if (zend_hash_find(XG(coverages), filename, len, (void **) &pcov) == SUCCESS) {
-#ifdef DEBUG
-        fprintf(stderr, "got coverage %s %p\n", filename, *pcov);
-#endif
+        TRACE("got coverage %s %p", filename, *pcov);
         return *pcov;
     }
@@ -363 +347 @@
         zend_hash_init(cov, 0, NULL, NULL, 0);
         zend_hash_add(XG(coverages), filename, len, (void **) &cov, sizeof(cov), NULL);
-#ifdef DEBUG
-        fprintf(stderr, "new coverage %s %p\n", filename, cov);
-#endif
+        TRACE("new coverage %s %p", filename, cov);
         return cov;
     }
@@ -534 +516 @@
     }
     if (*p++ != PCOV_HEADER_MAGIC) {
-#ifdef DEBUG
-        fprintf(stderr, "wrong magic in xcache_coverager_decode");
-#endif
+        TRACE("%s", "wrong magic in xcache_coverager_decode");
         return;
     }