From: VMware, Inc <>
Date: Tue, 22 Nov 2011 00:00:16 +0000 (-0800)
Subject: lib/lock: more lack of "0x" before "%p"
X-Git-Tag: 2011.11.20-535097~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a84eaa3291c64b9bd9225b0cdf6bb0d2c2c89c8;p=thirdparty%2Fopen-vm-tools.git

lib/lock: more lack of "0x" before "%p"

Clean up some more.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
index 5b0e28e02..139e57ae4 100644
--- a/open-vm-tools/lib/lock/ul.c
+++ b/open-vm-tools/lib/lock/ul.c
@@ -514,7 +514,7 @@ MXUserListLocks(void)
       for (i = 0; i < perThread->locksHeld; i++) {
          MXUserHeader *hdr = perThread->lockArray[i];
 
-         Warning("\tMXUser lock %s (@%p) rank 0x%x\n", hdr->name, hdr,
+         Warning("\tMXUser lock %s (@0x%p) rank 0x%x\n", hdr->name, hdr,
                  hdr->rank);
       }
    }
@@ -735,7 +735,7 @@ MXUserReleaseTracking(MXUserHeader *header)  // IN: lock, via its header
 
    /* MXUserAcquisitionTracking should have already created a perThread */
    if (UNLIKELY(perThread == NULL)) {
-      MXUserDumpAndPanic(header, "%s: perThread not found! (thread %p)\n",
+      MXUserDumpAndPanic(header, "%s: perThread not found! (thread 0x%p)\n",
                          __FUNCTION__, tid);
    }
 
@@ -748,7 +748,8 @@ MXUserReleaseTracking(MXUserHeader *header)  // IN: lock, via its header
 
    /* The argument lock had better be in the perThread */
    if (UNLIKELY(i >= perThread->locksHeld)) {
-      MXUserDumpAndPanic(header, "%s: lock not found! (thread %p; count %u)\n",
+      MXUserDumpAndPanic(header,
+                         "%s: lock not found! (thread 0x%p; count %u)\n",
                          __FUNCTION__, tid, perThread->locksHeld);
    }
 
diff --git a/open-vm-tools/lib/lock/ulBarrier.c b/open-vm-tools/lib/lock/ulBarrier.c
index 9455224ac..15bfbcac3 100644
--- a/open-vm-tools/lib/lock/ulBarrier.c
+++ b/open-vm-tools/lib/lock/ulBarrier.c
@@ -69,7 +69,7 @@ MXUserDumpBarrier(MXUserHeader *header)  // IN:
    Warning("\trank 0x%X\n", barrier->header.rank);
    Warning("\tserial number %u\n", barrier->header.serialNumber);
 
-   Warning("\tlock %p\n", barrier->lock);
+   Warning("\tlock 0x%p\n", barrier->lock);
    Warning("\tconfigured count %u\n", barrier->configCount);
    curContext = barrier->curContext;