Changeset 90792 in vbox for trunk/include

Timestamp:

Aug 23, 2021 10:29:03 AM (4 years ago)

Author:

vboxsync

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

146427

Message:

*: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

Location:

trunk/include

Files:

• VBox/HostServices/GuestPropertySvc.h (modified) (2 diffs)
• VBox/HostServices/Service.h (modified) (7 diffs)
• VBox/hgcmsvc.h (modified) (5 diffs)
• VBox/vd-ifs.h (modified) (2 diffs)
• iprt/assert.h (modified) (10 diffs)
• iprt/cdefs.h (modified) (1 diff)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -125 +125 @@
     int rc = VINF_SUCCESS;
     uint32_t fFlags = 0;
-    AssertLogRelReturn(VALID_PTR(pfFlags), VERR_INVALID_POINTER);
+    AssertLogRelReturn(RT_VALID_PTR(pfFlags), VERR_INVALID_POINTER);
 
     if (pcszFlags)
@@ -182 +182 @@
     int rc = VINF_SUCCESS;
 
-    AssertLogRelReturn(VALID_PTR(pszFlags), VERR_INVALID_POINTER);
+    AssertLogRelReturn(RT_VALID_PTR(pszFlags), VERR_INVALID_POINTER);
     if ((fFlags & ~GUEST_PROP_F_ALLFLAGS) == GUEST_PROP_F_NILFLAG)
     {

trunk/include/VBox/HostServices/Service.h

@@ -161 +161 @@
         int rc = VINF_SUCCESS;
 
-        if (!VALID_PTR(pTable))
+        if (!RT_VALID_PTR(pTable))
             rc = VERR_INVALID_PARAMETER;
         else
@@ -242 +242 @@
     static DECLCALLBACK(int) svcUnload(void *pvService)
     {
-        AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+        AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
         int rc = pSelf->uninit();
@@ -262 +262 @@
     {
         RT_NOREF(fRequestor, fRestoring);
-        AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+        AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
         LogFlowFunc(("pvService=%p, idClient=%u, pvClient=%p\n", pvService, idClient, pvClient));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
@@ -278 +278 @@
                                            void *pvClient)
     {
-        AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+        AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
         LogFlowFunc(("pvService=%p, idClient=%u, pvClient=%p\n", pvService, idClient, pvClient));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
@@ -299 +299 @@
                                       uint64_t tsArrival)
     {
-        AssertLogRelReturnVoid(VALID_PTR(pvService));
+        AssertLogRelReturnVoid(RT_VALID_PTR(pvService));
         LogFlowFunc(("pvService=%p, callHandle=%p, idClient=%u, pvClient=%p, u32Function=%u, cParms=%u, paParms=%p\n",
                      pvService, callHandle, idClient, pvClient, u32Function, cParms, paParms));
@@ -317 +317 @@
                                          VBOXHGCMSVCPARM paParms[])
     {
-        AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+        AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
         LogFlowFunc(("pvService=%p, u32Function=%u, cParms=%u, paParms=%p\n", pvService, u32Function, cParms, paParms));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
@@ -333 +333 @@
                                                   void *pvExtension)
     {
-        AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+        AssertLogRelReturn(RT_VALID_PTR(pvService), VERR_INVALID_PARAMETER);
         LogFlowFunc(("pvService=%p, pfnExtension=%p, pvExtention=%p\n", pvService, pfnExtension, pvExtension));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);

trunk/include/VBox/hgcmsvc.h

@@ -314 +314 @@
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
     if (   pParm->type == VBOX_HGCM_SVC_PARM_PTR
-        && VALID_PTR(pParm->u.pointer.addr)
+        && RT_VALID_PTR(pParm->u.pointer.addr)
         && pParm->u.pointer.size > 0)
     {
@@ -333 +333 @@
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
     if (   pParm->type == VBOX_HGCM_SVC_PARM_PTR
-        && VALID_PTR(pParm->u.pointer.addr)
+        && RT_VALID_PTR(pParm->u.pointer.addr)
         && pParm->u.pointer.size > 0)
     {
@@ -351 +351 @@
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
     if (   pParm->type == VBOX_HGCM_SVC_PARM_PTR
-        && VALID_PTR(pParm->u.pointer.addr)
+        && RT_VALID_PTR(pParm->u.pointer.addr)
         && pParm->u.pointer.size > 0)
     {
@@ -374 +374 @@
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
     if (   pParm->type == VBOX_HGCM_SVC_PARM_PTR
-        && VALID_PTR(pParm->u.pointer.addr)
+        && RT_VALID_PTR(pParm->u.pointer.addr)
         && pParm->u.pointer.size > 0)
     {
@@ -397 +397 @@
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
     if (   pParm->type == VBOX_HGCM_SVC_PARM_PTR
-        && VALID_PTR(pParm->u.pointer.addr)
+        && RT_VALID_PTR(pParm->u.pointer.addr)
         && pParm->u.pointer.size > 0)
     {

trunk/include/VBox/vd-ifs.h

@@ -160 +160 @@
                     ("enmInterface=%u", enmInterface), VERR_INVALID_PARAMETER);
 
-    AssertMsgReturn(VALID_PTR(ppVDIfs),
-                    ("pInterfaceList=%#p", ppVDIfs),
-                    VERR_INVALID_PARAMETER);
+    AssertPtrReturn(ppVDIfs, VERR_INVALID_PARAMETER);
 
     /* Fill out interface descriptor. */
@@ -190 +188 @@
 
     /* Argument checks. */
-    AssertMsgReturn(VALID_PTR(pInterface),
-                    ("pInterface=%#p", pInterface),
-                    VERR_INVALID_PARAMETER);
-
-    AssertMsgReturn(VALID_PTR(ppVDIfs),
-                    ("pInterfaceList=%#p", ppVDIfs),
-                    VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pInterface, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(ppVDIfs, VERR_INVALID_PARAMETER);
 
     if (*ppVDIfs)

trunk/include/iprt/assert.h

@@ -2572 +2572 @@
  * @param   pv      The pointer.
  */
-#define AssertPtr(pv)                   AssertMsg(VALID_PTR(pv), ("%p\n", (pv)))
+#define AssertPtr(pv)                   AssertMsg(RT_VALID_PTR(pv), ("%p\n", (pv)))
 
 /** @def AssertPtrReturn
@@ -2580 +2580 @@
  * @param   rcRet   What is to be presented to return.
  */
-#define AssertPtrReturn(pv, rcRet)      AssertMsgReturn(VALID_PTR(pv), ("%p\n", (pv)), rcRet)
+#define AssertPtrReturn(pv, rcRet)      AssertMsgReturn(RT_VALID_PTR(pv), ("%p\n", (pv)), rcRet)
 
 /** @def AssertPtrReturnVoid
@@ -2587 +2587 @@
  * @param   pv      The pointer.
  */
-#define AssertPtrReturnVoid(pv)         AssertMsgReturnVoid(VALID_PTR(pv), ("%p\n", (pv)))
+#define AssertPtrReturnVoid(pv)         AssertMsgReturnVoid(RT_VALID_PTR(pv), ("%p\n", (pv)))
 
 /** @def AssertPtrBreak
@@ -2594 +2594 @@
  * @param   pv      The pointer.
  */
-#define AssertPtrBreak(pv)              AssertMsgBreak(VALID_PTR(pv), ("%p\n", (pv)))
+#define AssertPtrBreak(pv)              AssertMsgBreak(RT_VALID_PTR(pv), ("%p\n", (pv)))
 
 /** @def AssertPtrBreakStmt
@@ -2602 +2602 @@
  * @param   stmt    Statement to execute before break in case of a failed assertion.
  */
-#define AssertPtrBreakStmt(pv, stmt)    AssertMsgBreakStmt(VALID_PTR(pv), ("%p\n", (pv)), stmt)
+#define AssertPtrBreakStmt(pv, stmt)    AssertMsgBreakStmt(RT_VALID_PTR(pv), ("%p\n", (pv)), stmt)
 
 /** @def AssertPtrNull
@@ -2609 +2609 @@
  * @param   pv      The pointer.
  */
-#define AssertPtrNull(pv)               AssertMsg(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
+#define AssertPtrNull(pv)               AssertMsg(RT_VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
 
 /** @def AssertPtrNullReturn
@@ -2617 +2617 @@
  * @param   rcRet   What is to be presented to return.
  */
-#define AssertPtrNullReturn(pv, rcRet)  AssertMsgReturn(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)), rcRet)
+#define AssertPtrNullReturn(pv, rcRet)  AssertMsgReturn(RT_VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)), rcRet)
 
 /** @def AssertPtrNullReturnVoid
@@ -2624 +2624 @@
  * @param   pv      The pointer.
  */
-#define AssertPtrNullReturnVoid(pv)     AssertMsgReturnVoid(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
+#define AssertPtrNullReturnVoid(pv)     AssertMsgReturnVoid(RT_VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
 
 /** @def AssertPtrNullBreak
@@ -2631 +2631 @@
  * @param   pv      The pointer.
  */
-#define AssertPtrNullBreak(pv)          AssertMsgBreak(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
+#define AssertPtrNullBreak(pv)          AssertMsgBreak(RT_VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
 
 /** @def AssertPtrNullBreakStmt
@@ -2639 +2639 @@
  * @param   stmt    Statement to execute before break in case of a failed assertion.
  */
-#define AssertPtrNullBreakStmt(pv, stmt) AssertMsgBreakStmt(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)), stmt)
+#define AssertPtrNullBreakStmt(pv, stmt) AssertMsgBreakStmt(RT_VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)), stmt)
 
 /** @def AssertGCPhys32

trunk/include/iprt/cdefs.h

@@ -4394 +4394 @@
 #define RT_VALID_ALIGNED_PTR(ptr, align)   \
     (   !((uintptr_t)(ptr) & (uintptr_t)((align) - 1)) \
-     && VALID_PTR(ptr) )
+     && RT_VALID_PTR(ptr) )