Changeset 83425 in vbox

Timestamp:

Mar 25, 2020 7:37:25 PM (5 years ago)

Author:

vboxsync

Message:

RUntime/RTJson: Add parse from VFS file method

Location:

trunk

Files:

• include/iprt/json.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/json.cpp (modified) (4 diffs)

trunk/include/iprt/json.h

@@ -125 +125 @@
 
 /**
+ * Parses a JSON document from the given VFS file
+ * returning the root JSON value.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_JSON_MALFORMED if the document does not conform to the spec.
+ * @param   phJsonVal       Where to store the handle to the JSON value on success.
+ * @param   hVfsFile        The VFS file to parse.
+ * @param   pErrInfo        Where to store extended error info. Optional.
+ */
+RTDECL(int) RTJsonParseFromVfsFile(PRTJSONVAL phJsonVal, RTVFSFILE hVfsFile, PRTERRINFO pErrInfo);
+
+/**
  * Retain a given JSON value.
  *

trunk/include/iprt/mangling.h

@@ -1171 +1171 @@
 # define RTJsonParseFromFile                            RT_MANGLER(RTJsonParseFromFile)
 # define RTJsonParseFromString                          RT_MANGLER(RTJsonParseFromString)
+# define RTJsonParseFromVfsFile                         RT_MANGLER(RTJsonParseFromVfsFile)
 # define RTJsonValueGetArraySize                        RT_MANGLER(RTJsonValueGetArraySize)
 # define RTJsonValueGetString                           RT_MANGLER(RTJsonValueGetString)

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

@@ -40 +40 @@
 #include <iprt/string.h>
 #include <iprt/utf16.h>
+#include <iprt/vfs.h>
 
 #include <stdlib.h> /* strtod() */
@@ -260 +261 @@
         PRTSTREAM           hStream;
         const uint8_t       *pbBuf;
+        RTVFSFILE           hVfsFile;
     } u;
 } RTJSONREADERARGS;
@@ -1429 +1431 @@
 }
 
+/**
+ * Read callback for RTJsonParseFromVfsFile().
+ */
+static DECLCALLBACK(int) rtJsonTokenizerParseFromVfsFile(void *pvUser, size_t offInput,
+                                                         void *pvBuf, size_t cbBuf,
+                                                         size_t *pcbRead)
+{
+    PRTJSONREADERARGS pArgs = (PRTJSONREADERARGS)pvUser;
+
+    RT_NOREF_PV(offInput);
+
+    size_t cbRead = 0;
+    int rc = RTVfsFileRead(pArgs->u.hVfsFile, pvBuf, cbBuf, &cbRead);
+    if (RT_SUCCESS(rc))
+        *pcbRead = cbRead;
+
+    return rc;
+}
+
 RTDECL(int) RTJsonParseFromBuf(PRTJSONVAL phJsonVal, const uint8_t *pbBuf, size_t cbBuf, PRTERRINFO pErrInfo)
 {
@@ -1491 +1512 @@
         }
         RTStrmClose(Args.u.hStream);
+    }
+
+    return rc;
+}
+
+RTDECL(int) RTJsonParseFromVfsFile(PRTJSONVAL phJsonVal, RTVFSFILE hVfsFile, PRTERRINFO pErrInfo)
+{
+    AssertPtrReturn(phJsonVal, VERR_INVALID_POINTER);
+    AssertReturn(hVfsFile != NIL_RTVFSFILE, VERR_INVALID_POINTER);
+
+    int rc = VINF_SUCCESS;
+    RTJSONREADERARGS Args;
+    RTJSONTOKENIZER Tokenizer;
+
+    Args.cbData   = 0;
+    Args.u.hVfsFile = hVfsFile;
+    rc = rtJsonTokenizerInit(&Tokenizer, rtJsonTokenizerParseFromVfsFile, &Args, pErrInfo);
+    if (RT_SUCCESS(rc))
+    {
+        rc = rtJsonParse(&Tokenizer, phJsonVal);
+        rtJsonTokenizerDestroy(&Tokenizer);
     }