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

Timestamp:

Aug 23, 2021 1:16:11 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146429

Message:

*: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxControl/testcase/tstVBoxControl.cpp (modified) (4 diffs)
• VBoxGuest/VBoxDev-haiku.c (modified) (3 diffs)
• VBoxGuest/VBoxGuest-freebsd.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp

@@ -88 +88 @@
     static char szValue[] = "Value";
     static char szFlags[] = "TRANSIENT";
-    if (VALID_PTR(ppszValue))
+    if (ppszValue)
         *ppszValue = szValue;
-    if (VALID_PTR(pu64Timestamp))
+    if (pu64Timestamp)
         *pu64Timestamp = 12345;
-    if (VALID_PTR(ppszFlags))
+    if (ppszFlags)
         *ppszFlags = szFlags;
-    if (VALID_PTR(pcbBufActual))
+    if (pcbBufActual)
         *pcbBufActual = 256;
     return VINF_SUCCESS;
@@ -129 +129 @@
     static char szFlags[] = "TRANSIENT";
     *ppHandle = &Handle;
-    if (VALID_PTR(ppszName))
+    if (ppszName)
         *ppszName = szName;
-    if (VALID_PTR(ppszValue))
+    if (ppszValue)
         *ppszValue = szValue;
-    if (VALID_PTR(pu64Timestamp))
+    if (pu64Timestamp)
         *pu64Timestamp = 12345;
-    if (VALID_PTR(ppszFlags))
+    if (ppszFlags)
         *ppszFlags = szFlags;
     return VINF_SUCCESS;
@@ -148 +148 @@
     RT_NOREF1(pHandle);
     RTPrintf("Called enumerate next...\n");
-    AssertReturn(VALID_PTR(ppszName) || VALID_PTR(ppszValue) || VALID_PTR(ppszFlags),
+    AssertReturn(RT_VALID_PTR(ppszName) || RT_VALID_PTR(ppszValue) || RT_VALID_PTR(ppszFlags),
                  VERR_INVALID_POINTER);
-    if (VALID_PTR(ppszName))
+    if (ppszName)
         *ppszName = NULL;
-    if (VALID_PTR(ppszValue))
+    if (ppszValue)
         *ppszValue = NULL;
-    if (VALID_PTR(pu64Timestamp))
+    if (pu64Timestamp)
         *pu64Timestamp = 0;
-    if (VALID_PTR(ppszFlags))
+    if (ppszFlags)
         *ppszFlags = NULL;
     return VINF_SUCCESS;
@@ -191 +191 @@
     static char szValue[] = "Value";
     static char szFlags[] = "TRANSIENT";
-    if (VALID_PTR(ppszName))
+    if (ppszName)
         *ppszName = szName;
-    if (VALID_PTR(ppszValue))
+    if (ppszValue)
         *ppszValue = szValue;
-    if (VALID_PTR(pu64Timestamp))
+    if (pu64Timestamp)
         *pu64Timestamp = 12345;
-    if (VALID_PTR(ppszFlags))
+    if (ppszFlags)
         *ppszFlags = szFlags;
-    if (VALID_PTR(pcbBufActual))
+    if (pcbBufActual)
         *pcbBufActual = 256;
     return VINF_SUCCESS;

trunk/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c

@@ -162 +162 @@
      * Close the session if it's still hanging on to the device...
      */
-    if (VALID_PTR(pSession))
+    if (RT_VALID_PTR(pSession))
     {
         VGDrvCommonCloseSession(&g_DevExt, pSession);
@@ -191 +191 @@
      * Validate the input.
      */
-    if (RT_UNLIKELY(!VALID_PTR(pSession)))
+    if (RT_UNLIKELY(!RT_VALID_PTR(pSession)))
         return EINVAL;
 
@@ -233 +233 @@
             return EFAULT;
         }
-        if (RT_UNLIKELY(!VALID_PTR(pvBuf)))
+        if (RT_UNLIKELY(!RT_VALID_PTR(pvBuf)))
         {
             RTMemTmpFree(pvBuf);

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

@@ -289 +289 @@
      * Close the session if it's still hanging on to the device...
      */
-    if (VALID_PTR(pSession))
+    if (RT_VALID_PTR(pSession))
     {
         VGDrvCommonCloseSession(&g_DevExt, pSession);
@@ -518 +518 @@
 
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
-    if (RT_UNLIKELY(!VALID_PTR(pSession))) {
+    if (RT_UNLIKELY(!RT_VALID_PTR(pSession))) {
         Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
         return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));