Changeset 90804 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin

Timestamp:

Aug 23, 2021 7:08:53 PM (4 years ago)

Author:

vboxsync

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

146439

Message:

HostDrivers: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -752 +752 @@
     uint64_t NanoTS = RTTimeSystemNanoTS();
     LogFlow(("vboxNetFltDarwinIffDetached: pThis=%p NanoTS=%RU64 (%d)\n",
-             pThis, NanoTS, VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) :  -1));
+             pThis, NanoTS, RT_VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) :  -1));
 
     Assert(!pThis->fDisconnectedFromHost);
@@ -771 +771 @@
 
     pIfNet = ASMAtomicUoReadPtrT(&pThis->u.s.pIfNet, ifnet_t);
-    int cPromisc = VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) : - 1;
+    int cPromisc = RT_VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) : - 1;
 
     ASMAtomicUoWriteNullPtr(&pThis->u.s.pIfNet);
@@ -836 +836 @@
      * Watch out for the interface going online / offline.
      */
-    if (    VALID_PTR(pThis)
-        &&  VALID_PTR(pEvMsg)
-        &&  pEvMsg->vendor_code  == KEV_VENDOR_APPLE
-        &&  pEvMsg->kev_class    == KEV_NETWORK_CLASS
-        &&  pEvMsg->kev_subclass == KEV_DL_SUBCLASS)
+    if (   RT_VALID_PTR(pThis)
+        && RT_VALID_PTR(pEvMsg)
+        && pEvMsg->vendor_code  == KEV_VENDOR_APPLE
+        && pEvMsg->kev_class    == KEV_NETWORK_CLASS
+        && pEvMsg->kev_subclass == KEV_DL_SUBCLASS)
     {
         if (pThis->u.s.pIfNet    == pIfNet)
@@ -881 +881 @@
         }
         else
-            Log(("vboxNetFltDarwinIffEvent: pThis->u.s.pIfNet=%p pIfNet=%p (%d)\n", pThis->u.s.pIfNet, pIfNet, VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) : -1));
-    }
-    else if (VALID_PTR(pEvMsg))
+            Log(("vboxNetFltDarwinIffEvent: pThis->u.s.pIfNet=%p pIfNet=%p (%d)\n", pThis->u.s.pIfNet, pIfNet, RT_VALID_PTR(pIfNet) ? VBOX_GET_PCOUNT(pIfNet) : -1));
+    }
+    else if (RT_VALID_PTR(pEvMsg))
         Log(("vboxNetFltDarwinIffEvent: vendor_code=%#x kev_class=%#x kev_subclass=%#x event_code=%#x\n",
              pEvMsg->vendor_code, pEvMsg->kev_class, pEvMsg->kev_subclass, pEvMsg->event_code));