Changeset 66819 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

May 8, 2017 3:04:32 PM (8 years ago)

Author:

vboxsync

Message:

htable.cpp: CrHTablePut should return CRHTABLE_HANDLE_INVALID not VERR_INVALID_PARAMETER. Fixed assertion misconceptions.

File:

• trunk/src/VBox/GuestHost/OpenGL/util/htable.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/htable.cpp

@@ -114 +114 @@
 VBOXHTABLEDECL(int) CrHTablePutToSlot(PCRHTABLE pTbl, CRHTABLE_HANDLE hHandle, void* pvData)
 {
-    if (!pvData)
-    {
-        AssertMsgFailed(("pvData is NULL\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertReturn(pvData, VERR_INVALID_PARAMETER);
     uint32_t iIndex = crHTableHandle2Index(hHandle);
     if (iIndex >= pTbl->cSize)
@@ -137 +133 @@
 VBOXHTABLEDECL(CRHTABLE_HANDLE) CrHTablePut(PCRHTABLE pTbl, void* pvData)
 {
-    if (!pvData)
-    {
-        AssertMsgFailed(("pvData is NULL\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertReturn(pvData, CRHTABLE_HANDLE_INVALID);
 
     if (pTbl->cSize == pTbl->cData)