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

Timestamp:

Jul 5, 2016 9:34:17 AM (8 years ago)

Author:

vboxsync

Message:

Runtime/RTJson: Fix review todos

File:

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

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

@@ -201 +201 @@
         {
             /** Number of elements in the array. */
-            uint32_t        cItems;
+            unsigned        cItems;
             /** Pointer to the array of items. */
             PRTJSONVALINT   *papItems;
@@ -209 +209 @@
         {
             /** Number of members. */
-            uint32_t        cMembers;
+            unsigned        cMembers;
             /** Pointer to the array holding the member names. */
             char            **papszNames;
@@ -1264 +1264 @@
 }
 
-RTDECL(int) RTJsonValueGetStringEx(RTJSONVAL hJsonVal, const char **ppszStr)
+RTDECL(int) RTJsonValueQueryString(RTJSONVAL hJsonVal, const char **ppszStr)
 {
     PRTJSONVALINT pThis = hJsonVal;
@@ -1275 +1275 @@
 }
 
-RTDECL(int) RTJsonValueGetNumber(RTJSONVAL hJsonVal, int64_t *pi64Num)
+RTDECL(int) RTJsonValueQueryInteger(RTJSONVAL hJsonVal, int64_t *pi64Num)
 {
     PRTJSONVALINT pThis = hJsonVal;
@@ -1286 +1286 @@
 }
 
-RTDECL(int) RTJsonValueGetByName(RTJSONVAL hJsonVal, const char *pszName, PRTJSONVAL phJsonVal)
+RTDECL(int) RTJsonValueQueryByName(RTJSONVAL hJsonVal, const char *pszName, PRTJSONVAL phJsonVal)
 {
     PRTJSONVALINT pThis = hJsonVal;
@@ -1309 +1309 @@
 }
 
-RTDECL(int) RTJsonValueGetNumberByName(RTJSONVAL hJsonVal, const char *pszName, int64_t *pi64Num)
+RTDECL(int) RTJsonValueQueryIntegerByName(RTJSONVAL hJsonVal, const char *pszName, int64_t *pi64Num)
 {
     RTJSONVAL hJsonValNum = NIL_RTJSONVAL;
-    int rc = RTJsonValueGetByName(hJsonVal, pszName, &hJsonValNum);
+    int rc = RTJsonValueQueryByName(hJsonVal, pszName, &hJsonValNum);
     if (RT_SUCCESS(rc))
     {
-        rc = RTJsonValueGetNumber(hJsonValNum, pi64Num);
+        rc = RTJsonValueQueryInteger(hJsonValNum, pi64Num);
         RTJsonValueRelease(hJsonValNum);
     }
@@ -1322 +1322 @@
 }
 
-RTDECL(int) RTJsonValueGetStringByName(RTJSONVAL hJsonVal, const char *pszName, char **ppszStr)
+RTDECL(int) RTJsonValueQueryStringByName(RTJSONVAL hJsonVal, const char *pszName, char **ppszStr)
 {
     RTJSONVAL hJsonValStr = NIL_RTJSONVAL;
-    int rc = RTJsonValueGetByName(hJsonVal, pszName, &hJsonValStr);
+    int rc = RTJsonValueQueryByName(hJsonVal, pszName, &hJsonValStr);
     if (RT_SUCCESS(rc))
     {
         const char *pszStr = NULL;
-        rc = RTJsonValueGetStringEx(hJsonValStr, &pszStr);
+        rc = RTJsonValueQueryString(hJsonValStr, &pszStr);
         if (RT_SUCCESS(rc))
         {
@@ -1342 +1342 @@
 }
 
-RTDECL(int) RTJsonValueGetBooleanByName(RTJSONVAL hJsonVal, const char *pszName, bool *pfBoolean)
+RTDECL(int) RTJsonValueQueryBooleanByName(RTJSONVAL hJsonVal, const char *pszName, bool *pfBoolean)
 {
     AssertPtrReturn(pfBoolean, VERR_INVALID_POINTER);
 
     RTJSONVAL hJsonValBool = NIL_RTJSONVAL;
-    int rc = RTJsonValueGetByName(hJsonVal, pszName, &hJsonValBool);
+    int rc = RTJsonValueQueryByName(hJsonVal, pszName, &hJsonValBool);
     if (RT_SUCCESS(rc))
     {
@@ -1363 +1363 @@
 }
 
-RTDECL(uint32_t) RTJsonValueGetArraySize(RTJSONVAL hJsonVal)
+RTDECL(unsigned) RTJsonValueGetArraySize(RTJSONVAL hJsonVal)
 {
     PRTJSONVALINT pThis = hJsonVal;
@@ -1372 +1372 @@
 }
 
-RTDECL(int) RTJsonValueGetArraySizeEx(RTJSONVAL hJsonVal, uint32_t *pcItems)
+RTDECL(int) RTJsonValueQueryArraySize(RTJSONVAL hJsonVal, unsigned *pcItems)
 {
     PRTJSONVALINT pThis = hJsonVal;
@@ -1383 +1383 @@
 }
 
-RTDECL(int) RTJsonValueGetByIndex(RTJSONVAL hJsonVal, uint32_t idx, PRTJSONVAL phJsonVal)
+RTDECL(int) RTJsonValueQueryByIndex(RTJSONVAL hJsonVal, unsigned idx, PRTJSONVAL phJsonVal)
 {
     PRTJSONVALINT pThis = hJsonVal;
@@ -1416 +1416 @@
 }
 
-RTDECL(int) RTJsonIteratorGetValue(RTJSONIT hJsonIt, PRTJSONVAL phJsonVal, const char **ppszName)
+RTDECL(int) RTJsonIteratorQueryValue(RTJSONIT hJsonIt, PRTJSONVAL phJsonVal, const char **ppszName)
 {
     PRTJSONITINT pIt = hJsonIt;