commit cc06c243d8be3ebb1190281653d2dba504c16c0f
author Behdad Esfahbod <behdad@behdad.org> Mon Jul 25 20:25:44 2011 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon Jul 25 20:34:17 2011 -0400
tree 4c8473708c78ea34be6d6c4d2601dd83490e0735
parent 43ff203d8ea3e1b09e316e3aae1a4e5ec15bfdd2

Streamline debugging infrastructure even more

src/hb-blob.cc

diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index f6537cd..2d0c016 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -243,27 +243,27 @@
 #endif
 
   if ((uintptr_t) -1L == pagesize) {
-    DEBUG_MSG (BLOB, "%p %s: failed to get pagesize: %s\n", (void *) blob, HB_FUNC, strerror (errno));
+    DEBUG_MSG_FUNC (BLOB, blob, "failed to get pagesize: %s", strerror (errno));
     return FALSE;
   }
-  DEBUG_MSG (BLOB, "%p %s: pagesize is %lu\n", (void *) blob, HB_FUNC, (unsigned long) pagesize);
+  DEBUG_MSG_FUNC (BLOB, blob, "pagesize is %lu", (unsigned long) pagesize);
 
   mask = ~(pagesize-1);
   addr = (const char *) (((uintptr_t) blob->data) & mask);
   length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask)  - addr;
-  DEBUG_MSG (BLOB, "%p %s: calling mprotect on [%p..%p] (%lu bytes)\n",
-		   (void *) blob, HB_FUNC,
-		   addr, addr+length, (unsigned long) length);
+  DEBUG_MSG_FUNC (BLOB, blob,
+		  "calling mprotect on [%p..%p] (%lu bytes)",
+		  addr, addr+length, (unsigned long) length);
   if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) {
-    DEBUG_MSG (BLOB, "%p %s: %s\n", (void *) blob, HB_FUNC, strerror (errno));
+    DEBUG_MSG_FUNC (BLOB, blob, "mprotect failed: %s", strerror (errno));
     return FALSE;
   }
 
   blob->mode = HB_MEMORY_MODE_WRITABLE;
 
-  DEBUG_MSG (BLOB, "%p %s: successfully made [%p..%p] (%lu bytes) writable\n",
-		   (void *) blob, HB_FUNC,
-		   addr, addr+length, (unsigned long) length);
+  DEBUG_MSG_FUNC (BLOB, blob,
+		  "successfully made [%p..%p] (%lu bytes) writable\n",
+		  addr, addr+length, (unsigned long) length);
   return TRUE;
 #else
   return FALSE;
@@ -273,12 +273,12 @@
 static bool
 _try_writable_inplace (hb_blob_t *blob)
 {
-  DEBUG_MSG (BLOB, "%p %s: making writable inplace\n", (void *) blob, HB_FUNC);
+  DEBUG_MSG_FUNC (BLOB, blob, "making writable inplace\n");
 
   if (_try_make_writable_inplace_unix (blob))
     return TRUE;
 
-  DEBUG_MSG (BLOB, "%p %s: making writable -> FAILED\n", (void *) blob, HB_FUNC);
+  DEBUG_MSG_FUNC (BLOB, blob, "making writable -> FAILED\n");
 
   /* Failed to make writable inplace, mark that */
   blob->mode = HB_MEMORY_MODE_READONLY;
@@ -301,7 +301,7 @@
     return TRUE;
 
 
-  DEBUG_MSG (BLOB, "%p %s -> %p\n", (void *) blob, HB_FUNC, blob->data);
+  DEBUG_MSG_FUNC (BLOB, blob, "currect data is -> %p\n", blob->data);
 
   char *new_data;
 
@@ -309,7 +309,7 @@
   if (unlikely (!new_data))
     return FALSE;
 
-  DEBUG_MSG (BLOB, "%p %s: dupped successfully -> %p\n", (void *) blob, HB_FUNC, blob->data);
+  DEBUG_MSG_FUNC (BLOB, blob, "dupped successfully -> %p\n", blob->data);
 
   memcpy (new_data, blob->data, blob->length);
   _hb_blob_destroy_user_data (blob);