Changeset 90790 in vbox

Timestamp:

Aug 23, 2021 10:28:01 AM (3 years ago)

Author:

vboxsync

Message:

Main: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

Location:

trunk/src/VBox/Main

Files:

• src-all/ExtPackManagerImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-client/ConsoleVRDPServer.cpp (modified) (1 diff)
• src-server/SnapshotImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -1433 +1433 @@
         if (   RT_SUCCESS(vrc)
             && !RTErrInfoIsSet(&ErrInfo.Core)
-            && VALID_PTR(m->pReg))
+            && RT_VALID_PTR(m->pReg))
         {
             if (   VBOXEXTPACK_IS_MAJOR_VER_EQUAL(m->pReg->u32Version, uVersion)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -4510 +4510 @@
     /* First check if the LUN already exists. */
     PCFGMNODE pLunL0 = CFGMR3GetChildF(pCtlInst, "LUN#%u", uLUN);
-    AssertReturn(!VALID_PTR(pLunL0) || fAttachDetach, VERR_INTERNAL_ERROR);
+    AssertReturn(!RT_VALID_PTR(pLunL0) || fAttachDetach, VERR_INTERNAL_ERROR);
 
     if (pLunL0)

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -2989 +2989 @@
 void ConsoleVRDPServer::Stop(void)
 {
-    Assert(VALID_PTR(this)); /** @todo r=bird: there are(/was) some odd cases where this buster was invalid on
-                              * linux. Just remove this when it's 100% sure that problem has been fixed. */
+    AssertPtr(this); /** @todo r=bird: there are(/was) some odd cases where this buster was invalid on
+                      * linux. Just remove this when it's 100% sure that problem has been fixed. */
 
 #ifdef VBOX_WITH_USB

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -3628 +3628 @@
 {
     Assert(!mParent->i_getMediaTreeLockHandle().isWriteLockOnCurrentThread());
-    Assert(!fOnlineMergePossible || VALID_PTR(aVMMALockList));
+    Assert(!fOnlineMergePossible || RT_VALID_PTR(aVMMALockList));
 
     AutoWriteLock alock(aHD COMMA_LOCKVAL_SRC_POS);