Changeset 73956 in vbox for trunk/src/VBox/Runtime/common/misc/json.cpp

Timestamp:

Aug 29, 2018 3:09:34 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Added RTJsonIteratorBeginArray and RTJsonIteratorBeginObject for more accurate JSON decoding. Early RTCRestArray implementation. bugref:9167

File:

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

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

@@ -1486 +1486 @@
 }
 
+static int rtJsonIteratorBeginWorker(PRTJSONVALINT pThis, PRTJSONIT phJsonIt)
+{
+    PRTJSONITINT pIt = (PRTJSONITINT)RTMemTmpAllocZ(sizeof(RTJSONITINT));
+    if (pIt)
+    {
+        RTJsonValueRetain(pThis);
+        pIt->pJsonVal = pThis;
+        pIt->idxCur = 0;
+
+        *phJsonIt = pIt;
+        return VINF_SUCCESS;
+    }
+    return VERR_NO_MEMORY;
+}
+
 RTDECL(int) RTJsonIteratorBegin(RTJSONVAL hJsonVal, PRTJSONIT phJsonIt)
 {
@@ -1491 +1506 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertPtrReturn(phJsonIt, VERR_INVALID_POINTER);
-
     RTJSON_TYPECHECK_CONTAINER_RETURN(pThis);
 
-    PRTJSONITINT pIt = (PRTJSONITINT)RTMemTmpAllocZ(sizeof(RTJSONITINT));
-    if (RT_UNLIKELY(!pIt))
-        return VERR_NO_MEMORY;
-
-    RTJsonValueRetain(hJsonVal);
-    pIt->pJsonVal = pThis;
-    pIt->idxCur = 0;
-    *phJsonIt = pIt;
-
-    return VINF_SUCCESS;
+    return rtJsonIteratorBeginWorker(pThis, phJsonIt);
+}
+
+RTDECL(int) RTJsonIteratorBeginArray(RTJSONVAL hJsonVal, PRTJSONIT phJsonIt)
+{
+    PRTJSONVALINT pThis = hJsonVal;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertPtrReturn(phJsonIt, VERR_INVALID_POINTER);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_ARRAY);
+
+    return rtJsonIteratorBeginWorker(pThis, phJsonIt);
+}
+
+RTDECL(int) RTJsonIteratorBeginObject(RTJSONVAL hJsonVal, PRTJSONIT phJsonIt)
+{
+    PRTJSONVALINT pThis = hJsonVal;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertPtrReturn(phJsonIt, VERR_INVALID_POINTER);
+    RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_OBJECT);
+
+    return rtJsonIteratorBeginWorker(pThis, phJsonIt);
 }