Changeset 90805 in vbox

Timestamp:

Aug 23, 2021 7:09:17 PM (3 years ago)

Author:

vboxsync

Message:

HostServices: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

Location:

trunk/src/VBox/HostServices

Files:

• GuestControl/VBoxGuestControlSvc.cpp (modified) (4 diffs)
• SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)
• SharedFolders/VBoxSharedFoldersSvc.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp

@@ -946 +946 @@
 GstCtrlService::svcUnload(void *pvService)
 {
-    AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+    AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
     SELF *pThis = reinterpret_cast<SELF *>(pvService);
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -967 +967 @@
 
     RT_NOREF(fRestoring, pvClient);
-    AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+    AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
     SELF *pThis = reinterpret_cast<SELF *>(pvService);
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -2383 +2383 @@
 GstCtrlService::svcHostCall(void *pvService, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
-    AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+    AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
     SELF *pThis = reinterpret_cast<SELF *>(pvService);
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -2496 +2496 @@
     LogFlowFunc(("pTable=%p\n", pTable));
 
-    if (!VALID_PTR(pTable))
-    {
+    if (!RT_VALID_PTR(pTable))
         rc = VERR_INVALID_PARAMETER;
-    }
     else
     {

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -2703 +2703 @@
     LogFlowFunc(("pTable=%p\n", pTable));
 
-    if (!VALID_PTR(pTable))
+    if (!RT_VALID_PTR(pTable))
     {
         rc = VERR_INVALID_PARAMETER;

trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFoldersSvc.cpp

@@ -1828 +1828 @@
     Log(("SharedFolders host service: VBoxHGCMSvcLoad: ptable = %p\n", ptable));
 
-    if (!VALID_PTR(ptable))
+    if (!RT_VALID_PTR(ptable))
     {
         LogRelFunc(("SharedFolders host service: Bad value of ptable (%p)\n", ptable));