Changeset 65999 in vbox

Timestamp:

Mar 8, 2017 8:04:19 PM (8 years ago)

Author:

vboxsync

Message:

AssertReturn on each condition is much more helpful when debugging.

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (1 diff)

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

@@ -1412 +1412 @@
 
 
-    if (   !(type == SHFL_HF_TYPE_DIR || type == SHFL_HF_TYPE_FILE)
-        || pcbBuffer == 0
-        || pObjInfo == 0
-        || *pcbBuffer < sizeof(SHFLFSOBJINFO))
-    {
-        AssertFailed();
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertReturn(type == SHFL_HF_TYPE_DIR || type == SHFL_HF_TYPE_FILE, VERR_INVALID_PARAMETER);
+    AssertReturn(pcbBuffer != NULL, VERR_INVALID_PARAMETER);
+    AssertReturn(pObjInfo != NULL, VERR_INVALID_PARAMETER);
+    AssertReturn(*pcbBuffer >= sizeof(SHFLFSOBJINFO), VERR_INVALID_PARAMETER);
 
     /** @todo other options */