Changeset 90789 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

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

Author:

vboxsync

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

146424

Message:

IPRT: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

Location:

trunk/src/VBox/Runtime/generic

Files:

• RTFileCopyByHandlesEx-generic.cpp (modified) (1 diff)
• RTFileCopyEx-generic.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/generic/RTFileCopyByHandlesEx-generic.cpp

@@ -45 +45 @@
     AssertMsgReturn(RTFileIsValid(hFileSrc), ("hFileSrc=%RTfile\n", hFileSrc), VERR_INVALID_PARAMETER);
     AssertMsgReturn(RTFileIsValid(hFileDst), ("hFileDst=%RTfile\n", hFileDst), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(!pfnProgress || VALID_PTR(pfnProgress), ("pfnProgress=%p\n", pfnProgress), VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(pfnProgress, VERR_INVALID_POINTER);
 
     /*

trunk/src/VBox/Runtime/generic/RTFileCopyEx-generic.cpp

@@ -41 +41 @@
      * Validate input.
      */
-    AssertMsgReturn(VALID_PTR(pszSrc), ("pszSrc=%p\n", pszSrc), VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszSrc, VERR_INVALID_POINTER);
     AssertMsgReturn(*pszSrc, ("pszSrc=%p\n", pszSrc), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(pszDst), ("pszDst=%p\n", pszDst), VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszDst, VERR_INVALID_POINTER);
     AssertMsgReturn(*pszDst, ("pszDst=%p\n", pszDst), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(!pfnProgress || VALID_PTR(pfnProgress), ("pfnProgress=%p\n", pfnProgress), VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pfnProgress, VERR_INVALID_POINTER);
     AssertMsgReturn(!(fFlags & ~RTFILECOPY_FLAGS_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);