Changeset 63409 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 13, 2016 1:53:02 AM (8 years ago)

Author:

vboxsync

Message:

VBoxGuest-netbsd.c: Use func in Log messages instead of hardcoding
the function name.

File:

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

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

@@ -257 +257 @@
      */
     if (IOCPARM_LEN(command) != sizeof(VBGLBIGREQ)) {
-        Log((DEVICE_NAME ": VBoxGuestFreeBSDIOCtl: bad request %lu size=%lu expected=%d\n", command, IOCPARM_LEN(command), sizeof(VBGLBIGREQ)));
+        Log((DEVICE_NAME ": %s: bad request %lu size=%lu expected=%d\n",
+             __func__, command, IOCPARM_LEN(command), sizeof(VBGLBIGREQ)));
         return ENOTTY;
     }
@@ -264 +265 @@
     if (ReqWrap->u32Magic != VBGLBIGREQ_MAGIC)
     {
-        Log((DEVICE_NAME ": VBoxGuestNetBSDIOCtl: bad magic %#x; pArg=%p Cmd=%lu.\n", ReqWrap->u32Magic, data, command));
+        Log((DEVICE_NAME ": %s: bad magic %#x; pArg=%p Cmd=%lu.\n",
+             __func__, ReqWrap->u32Magic, data, command));
         return EINVAL;
     }
@@ -280 +282 @@
     if (RT_UNLIKELY(!pvBuf))
     {
-        Log((DEVICE_NAME ":VBoxGuestNetBSDIOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", ReqWrap->cbData));
+        Log((DEVICE_NAME ": %s: RTMemTmpAlloc failed to alloc %d bytes.\n",
+             __func__, ReqWrap->cbData));
         return ENOMEM;
     }
@@ -288 +291 @@
     {
         RTMemTmpFree(pvBuf);
-        Log((DEVICE_NAME ":VBoxGuestNetBSDIOCtl: copyin failed; pvBuf=%p pArg=%p Cmd=%lu. rc=%d\n", pvBuf, data, command, rc));
+        Log((DEVICE_NAME ": %s: copyin failed; pvBuf=%p pArg=%p Cmd=%lu. rc=%d\n",
+             __func__, pvBuf, data, command, rc));
 aprint_error_dev(vboxguest->sc_dev, "copyin failed\n");
         return EFAULT;
@@ -296 +300 @@
     {
         RTMemTmpFree(pvBuf);
-        Log((DEVICE_NAME ":VBoxGuestNetBSDIOCtl: pvBuf invalid pointer %p\n", pvBuf));
+        Log((DEVICE_NAME ": %s: pvBuf invalid pointer %p\n",
+             __func__, pvBuf));
         return EINVAL;
     }
@@ -309 +314 @@
         if (RT_UNLIKELY(cbDataReturned > ReqWrap->cbData))
         {
-            Log((DEVICE_NAME ":VBoxGuestNetBSDIOCtl: too much output data %d expected %d\n", cbDataReturned, ReqWrap->cbData));
+            Log((DEVICE_NAME ": %s: too much output data %d expected %d\n",
+                 cbDataReturned, ReqWrap->cbData));
             cbDataReturned = ReqWrap->cbData;
         }
@@ -317 +323 @@
             if (RT_UNLIKELY(rc))
             {
-                Log((DEVICE_NAME ":VBoxGuestNetBSDIOCtl: copyout failed; pvBuf=%p pArg=%p. rc=%d\n", pvBuf, data, rc));
+                Log((DEVICE_NAME ": %s: copyout failed; pvBuf=%p pArg=%p. rc=%d\n",
+                     __func__, pvBuf, data, rc));
             }
         }
     } else {
-        Log((DEVICE_NAME ":VBoxGuestNetBSDIOCtl: VGDrvCommonIoCtl failed. rc=%d\n", rc));
+        Log((DEVICE_NAME ": %s: VGDrvCommonIoCtl failed. rc=%d\n",
+             __func__, rc));
         rc = -rc;
     }