Changeset 21117 in vbox for trunk

Timestamp:

Jul 1, 2009 12:44:18 PM (16 years ago)

Author:

vboxsync

Message:

xpcom: fix logging crashes caused by bitness issues

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (8 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -2096 +2096 @@
   const char *name;
   mIInfo->GetNameShared(&name);
-  LOG(("{%p} DConnectStub::<dtor>(): peer=%d instance=%p {%s}\n",
+  LOG(("{%p} DConnectStub::<dtor>(): peer=%d instance=%#llx {%s}\n",
        this, mPeerID, mInstance, name));
 #endif
@@ -2293 +2293 @@
     iinfoQ->GetNameShared(&nameQ);
     LOG(("calling QueryInterface {%s} on peer object "
-         "(stub=%p, instance=%p {%s})\n",
+         "(stub=%p, instance=%#llx {%s})\n",
          nameQ, this, mInstance, name));
   }
@@ -2368 +2368 @@
   PRUint8 i, paramCount = aInfo->GetParamCount();
 
-  LOG(("  instance=%p\n", mInstance));
+  LOG(("  instance=%#llx\n", mInstance));
   LOG(("  name=%s\n", aInfo->GetName()));
   LOG(("  param-count=%u\n", (PRUint32) paramCount));
@@ -2595 +2595 @@
     const DConnectSetupReply *reply = (const DConnectSetupReply *) op;
 
-    LOG(("got SETUP_REPLY: status=%x instance=%p\n", reply->status, reply->instance));
+    LOG(("got SETUP_REPLY: status=%x instance=%#llx\n", reply->status, reply->instance));
 
     mStatus = reply->status;
@@ -3122 +3122 @@
   stub->GetInterfaceInfo(getter_AddRefs(iinfo));
   iinfo->GetNameShared(&name);
-  LOG(("ipcDConnectService::StoreStub(): stub=%p instance=%p {%s}\n",
+  LOG(("ipcDConnectService::StoreStub(): stub=%p instance=%#llx {%s}\n",
        stub, stub->Instance(), name));
 #endif
@@ -3138 +3138 @@
   stub->GetInterfaceInfo(getter_AddRefs(iinfo));
   iinfo->GetNameShared(&name);
-  LOG(("ipcDConnectService::DeleteStub(): stub=%p instance=%p {%s}\n",
+  LOG(("ipcDConnectService::DeleteStub(): stub=%p instance=%#llx {%s}\n",
        stub, stub->Instance(), name));
 #endif
@@ -3621 +3621 @@
 ipcDConnectService::OnRelease(PRUint32 peer, const DConnectRelease *release)
 {
-  LOG(("ipcDConnectService::OnRelease [peer=%u instance=%p]\n",
+  LOG(("ipcDConnectService::OnRelease [peer=%u instance=%#llx]\n",
        peer, release->instance));
 
@@ -3656 +3656 @@
 ipcDConnectService::OnInvoke(PRUint32 peer, const DConnectInvoke *invoke, PRUint32 opLen)
 {
-  LOG(("ipcDConnectService::OnInvoke [peer=%u instance=%p method=%u]\n",
+  LOG(("ipcDConnectService::OnInvoke [peer=%u instance=%#llx method=%u]\n",
       peer, invoke->instance, invoke->method_index));