Changeset 73996 in vbox

Timestamp:

Aug 31, 2018 10:40:15 AM (7 years ago)

Author:

vboxsync

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

124737

Message:

IPRT/json: don't check the handle twice. bugref:9167

File:

• trunk/src/VBox/Runtime/common/misc/json.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/misc/json.cpp

@@ -1351 +1351 @@
 
 
-#define RTJSON_ASSERT_TYPE_RETURN(pJson, enmExpectedType, ret) do { \
+#define RTJSON_ASSERT_VALID_HANDLE_AND_TYPE_RETURN(pJson, enmExpectedType, ret) do { \
         AssertPtrReturn((pJson), (ret));  \
         AssertReturn((pJson) != NIL_RTJSONVAL, (ret)); \
@@ -1358 +1358 @@
 
 #define RTJSON_TYPECHECK_RETURN(pJson, enmExpectedType) do {\
-        if (RT_LIKELY((pJson) != NIL_RTJSONVAL)) { /*likely*/ } \
-        else return VERR_INVALID_HANDLE; \
         if ((pJson)->enmType == (enmExpectedType)) { /*likely*/ } \
-        else return VERR_JSON_VALUE_INVALID_TYPE; \
+        else { /*AssertFailed();*/ return VERR_JSON_VALUE_INVALID_TYPE; } \
     } while (0)
 
 
 #define RTJSON_TYPECHECK_CONTAINER_RETURN(pJson) do { \
-        if (RT_LIKELY((pJson) != NIL_RTJSONVAL)) { /* likely */ } \
-        else return VERR_INVALID_HANDLE; \
         if (   (pJson)->enmType == RTJSONVALTYPE_ARRAY  \
             || (pJson)->enmType == RTJSONVALTYPE_OBJECT) \
         { /* likely */ } \
-        else return VERR_JSON_VALUE_INVALID_TYPE; \
+        else { /*AssertFailed();*/ return VERR_JSON_VALUE_INVALID_TYPE;} \
     } while (0)
 
@@ -1378 +1374 @@
 {
     PRTJSONVALINT pThis = hJsonVal;
-    RTJSON_ASSERT_TYPE_RETURN(pThis, RTJSONVALTYPE_STRING, NULL);
+    RTJSON_ASSERT_VALID_HANDLE_AND_TYPE_RETURN(pThis, RTJSONVALTYPE_STRING, NULL);
 
     return pThis->Type.String.pszStr;
@@ -1487 +1483 @@
 {
     PRTJSONVALINT pThis = hJsonVal;
-    RTJSON_ASSERT_TYPE_RETURN(pThis, RTJSONVALTYPE_ARRAY, 0);
+    RTJSON_ASSERT_VALID_HANDLE_AND_TYPE_RETURN(pThis, RTJSONVALTYPE_ARRAY, 0);
 
     return pThis->Type.Array.cItems;