Changeset 90785 in vbox for trunk/src

Timestamp:

Aug 23, 2021 9:43:25 AM (3 years ago)

Author:

vboxsync

Message:

*: AssertReturn(VALID_PTR(),...) -> AssertPtrReturn

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (modified) (1 diff)
• ImageMounter/vboximg-mount/vboximgCrypto.cpp (modified) (2 diffs)
• Main/src-server/MediumImpl.cpp (modified) (4 diffs)
• Storage/testcase/vbox-img.cpp (modified) (2 diffs)
• VMM/VMMR3/VM.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

@@ -1434 +1434 @@
      */
     PVBOXNETFLTVNIC pVNIC = pvIfData;
-    AssertReturn(VALID_PTR(pVNIC), VERR_INVALID_POINTER);
+    AssertPtrReturn(pVNIC, VERR_INVALID_POINTER);
     AssertMsgReturn(pVNIC->u32Magic == VBOXNETFLTVNIC_MAGIC,
                     ("Invalid magic=%#x (expected %#x)\n", pVNIC->u32Magic, VBOXNETFLTVNIC_MAGIC),

trunk/src/VBox/ImageMounter/vboximg-mount/vboximgCrypto.cpp

@@ -294 +294 @@
     VDISKCRYPTOSETTINGS *pSettings = (VDISKCRYPTOSETTINGS *)pvUser;
     AssertPtrReturn(pSettings, VERR_GENERAL_FAILURE);
-    AssertReturn(VALID_PTR(pcbValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbValue, VERR_INVALID_POINTER);
 
     size_t cbValue = 0;
@@ -322 +322 @@
     VDISKCRYPTOSETTINGS *pSettings = (VDISKCRYPTOSETTINGS *)pvUser;
     AssertPtrReturn(pSettings, VERR_GENERAL_FAILURE);
-    AssertReturn(VALID_PTR(pszValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
 
     const char *psz = NULL;

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

@@ -8088 +8088 @@
                                               size_t *pcbValue)
 {
-    AssertReturn(VALID_PTR(pcbValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbValue, VERR_INVALID_POINTER);
 
     Medium *that = static_cast<Medium*>(pvUser);
@@ -8112 +8112 @@
                                           size_t cchValue)
 {
-    AssertReturn(VALID_PTR(pszValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
 
     Medium *that = static_cast<Medium*>(pvUser);
@@ -8146 +8146 @@
     MediumCryptoFilterSettings *pSettings = (MediumCryptoFilterSettings *)pvUser;
     AssertPtrReturn(pSettings, VERR_GENERAL_FAILURE);
-    AssertReturn(VALID_PTR(pcbValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbValue, VERR_INVALID_POINTER);
 
     size_t cbValue = 0;
@@ -8174 +8174 @@
     MediumCryptoFilterSettings *pSettings = (MediumCryptoFilterSettings *)pvUser;
     AssertPtrReturn(pSettings, VERR_GENERAL_FAILURE);
-    AssertReturn(VALID_PTR(pszValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
 
     const char *psz = NULL;

trunk/src/VBox/Storage/testcase/vbox-img.cpp

@@ -1630 +1630 @@
 static DECLCALLBACK(int) vdIfCfgCreateBaseQuerySize(void *pvUser, const char *pszName, size_t *pcbValue)
 {
-    AssertReturn(VALID_PTR(pcbValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbValue, VERR_INVALID_POINTER);
 
     AssertPtrReturn(pvUser, VERR_GENERAL_FAILURE);
@@ -1644 +1644 @@
 static DECLCALLBACK(int) vdIfCfgCreateBaseQuery(void *pvUser, const char *pszName, char *pszValue, size_t cchValue)
 {
-    AssertReturn(VALID_PTR(pszValue), VERR_INVALID_POINTER);
+    AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
 
     AssertPtrReturn(pvUser, VERR_GENERAL_FAILURE);

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -1751 +1751 @@
     VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     VM_ASSERT_OTHER_THREAD(pVM);
-    AssertReturn(VALID_PTR(pszFilename), VERR_INVALID_POINTER);
+    AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
     AssertReturn(*pszFilename, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(pfnProgress, VERR_INVALID_POINTER);