Changeset 63411 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Aug 13, 2016 2:07:08 AM (8 years ago)

Author:

vboxsync

Message:

VBoxGuest-netbsd.c: fix printf formats in logs.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (8 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -251 +251 @@
     int rc = 0;
 
-    LogFlow((DEVICE_NAME ": %s\n", __func__));
+    LogFlow((DEVICE_NAME ": %s: command=%#lx data=%p\n",
+             __func__, command, data));
 
     /*
@@ -257 +258 @@
      */
     if (IOCPARM_LEN(command) != sizeof(VBGLBIGREQ)) {
-        Log((DEVICE_NAME ": %s: bad request %lu size=%lu expected=%d\n",
+        Log((DEVICE_NAME ": %s: bad request %#lx size=%lu expected=%zu\n",
              __func__, command, IOCPARM_LEN(command), sizeof(VBGLBIGREQ)));
         return ENOTTY;
@@ -265 +266 @@
     if (ReqWrap->u32Magic != VBGLBIGREQ_MAGIC)
     {
-        Log((DEVICE_NAME ": %s: bad magic %#x; pArg=%p Cmd=%lu.\n",
+        Log((DEVICE_NAME ": %s: bad magic %#" PRIx32 "; pArg=%p Cmd=%#lx\n",
              __func__, ReqWrap->u32Magic, data, command));
         return EINVAL;
@@ -272 +273 @@
                     || ReqWrap->cbData > _1M*16))
     {
-        printf(DEVICE_NAME ": VBoxGuestNetBSDIOCtl: bad size %#x; pArg=%p Cmd=%lu.\n", ReqWrap->cbData, data, command);
+        Log((DEVICE_NAME ": %s: bad size %" PRIu32 "; pArg=%p Cmd=%#lx\n",
+             __func__, ReqWrap->cbData, data, command));
         return EINVAL;
     }
@@ -282 +284 @@
     if (RT_UNLIKELY(!pvBuf))
     {
-        Log((DEVICE_NAME ": %s: RTMemTmpAlloc failed to alloc %d bytes.\n",
+        Log((DEVICE_NAME ": %s: RTMemTmpAlloc failed to alloc %" PRIu32 " bytes.\n",
              __func__, ReqWrap->cbData));
         return ENOMEM;
@@ -291 +293 @@
     {
         RTMemTmpFree(pvBuf);
-        Log((DEVICE_NAME ": %s: copyin failed; pvBuf=%p pArg=%p Cmd=%lu. rc=%d\n",
+        Log((DEVICE_NAME ": %s: copyin failed; pvBuf=%p pArg=%p Cmd=%#lx. rc=%d\n",
              __func__, pvBuf, data, command, rc));
-aprint_error_dev(vboxguest->sc_dev, "copyin failed\n");
+        aprint_error_dev(vboxguest->sc_dev, "copyin failed\n");
         return EFAULT;
     }
@@ -300 +302 @@
     {
         RTMemTmpFree(pvBuf);
-        Log((DEVICE_NAME ": %s: pvBuf invalid pointer %p\n",
+        Log((DEVICE_NAME ": %s: invalid pvBuf=%p\n",
              __func__, pvBuf));
         return EINVAL;
@@ -314 +316 @@
         if (RT_UNLIKELY(cbDataReturned > ReqWrap->cbData))
         {
-            Log((DEVICE_NAME ": %s: too much output data %d expected %d\n",
+            Log((DEVICE_NAME ": %s: too much output data %zu expected %" PRIu32 "\n",
                  __func__, cbDataReturned, ReqWrap->cbData));
             cbDataReturned = ReqWrap->cbData;