Changeset 62446 in vbox

Timestamp:

Jul 22, 2016 2:12:06 PM (9 years ago)

Author:

vboxsync

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

108999

Message:

json.cpp: You won't normally ever use the 'asz' HN prefix. Removed several unused variables and one unnecessary RT_ZERO(128 bytes).

File:

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

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

@@ -448 +448 @@
     char ch = rtJsonTokenizerGetCh(pTokenizer);
     size_t cchLiteral = 0;
-    char aszLiteral[6]; /* false + 0 terminator as the lingest possible literal. */
-    RT_ZERO(aszLiteral);
+    char szLiteral[6]; /* false + 0 terminator as the lingest possible literal. */
+    RT_ZERO(szLiteral);
 
     pToken->Pos = pTokenizer->Pos;
@@ -456 +456 @@
 
     while (   RT_C_IS_ALPHA(ch)
-           && cchLiteral < RT_ELEMENTS(aszLiteral) - 1)
-    {
-        aszLiteral[cchLiteral] = ch;
+           && cchLiteral < RT_ELEMENTS(szLiteral) - 1)
+    {
+        szLiteral[cchLiteral] = ch;
         cchLiteral++;
         rtJsonTokenizerSkipCh(pTokenizer);
@@ -464 +464 @@
     }
 
-    if (!RTStrNCmp(&aszLiteral[0], "false", RT_ELEMENTS(aszLiteral)))
+    if (!RTStrNCmp(&szLiteral[0], "false", RT_ELEMENTS(szLiteral)))
         pToken->enmClass = RTJSONTOKENCLASS_FALSE;
-    else if (!RTStrNCmp(&aszLiteral[0], "true", RT_ELEMENTS(aszLiteral)))
+    else if (!RTStrNCmp(&szLiteral[0], "true", RT_ELEMENTS(szLiteral)))
         pToken->enmClass = RTJSONTOKENCLASS_TRUE;
-    else if (!RTStrNCmp(&aszLiteral[0], "null", RT_ELEMENTS(aszLiteral)))
+    else if (!RTStrNCmp(&szLiteral[0], "null", RT_ELEMENTS(szLiteral)))
         pToken->enmClass = RTJSONTOKENCLASS_NULL;
     else
@@ -489 +489 @@
 static int rtJsonTokenizerGetNumber(PRTJSONTOKENIZER pTokenizer, PRTJSONTOKEN pToken)
 {
-    unsigned uBase = 10;
-    char *pszNext = NULL;
     size_t cchNum = 0;
-    char aszTmp[128]; /* Everything larger is not possible to display in signed 64bit. */
-    RT_ZERO(aszTmp);
+    char   szTmp[128]; /* Everything larger is not possible to display in signed 64bit. */
 
     pToken->enmClass = RTJSONTOKENCLASS_NUMBER;
@@ -499 +496 @@
     char ch = rtJsonTokenizerGetCh(pTokenizer);
     while (   RT_C_IS_DIGIT(ch)
-           && cchNum < sizeof(aszTmp) - 1)
-    {
-        aszTmp[cchNum] = ch;
+           && cchNum < sizeof(szTmp) - 1)
+    {
+        szTmp[cchNum] = ch;
         cchNum++;
         rtJsonTokenizerSkipCh(pTokenizer);
@@ -508 +505 @@
 
     int rc = VINF_SUCCESS;
-    if (RT_C_IS_DIGIT(ch) && cchNum == sizeof(aszTmp) - 1)
+    if (RT_C_IS_DIGIT(ch) && cchNum >= sizeof(szTmp) - 1)
         rc = VERR_NUMBER_TOO_BIG;
     else
     {
-        rc = RTStrToInt64Ex(&aszTmp[0], NULL, 0, &pToken->Class.Number.i64Num);
+        szTmp[cchNum] = '\0';
+        rc = RTStrToInt64Ex(&szTmp[0], NULL, 0, &pToken->Class.Number.i64Num);
         Assert(RT_SUCCESS(rc) || rc == VWRN_NUMBER_TOO_BIG);
         if (rc == VWRN_NUMBER_TOO_BIG)
@@ -532 +530 @@
     int rc = VINF_SUCCESS;
     size_t cchStr = 0;
-    char aszTmp[_4K];
-    RT_ZERO(aszTmp);
+    char szTmp[_4K];
+    RT_ZERO(szTmp);
 
     Assert(rtJsonTokenizerGetCh(pTokenizer) == '\"');
@@ -544 +542 @@
     while (   ch != '\"'
            && ch != '\0'
-           && cchStr < sizeof(aszTmp) - 1)
+           && cchStr < sizeof(szTmp) - 1)
     {
         if (ch == '\\')
@@ -554 +552 @@
             {
                 case '\"':
-                    aszTmp[cchStr] = '\"';
+                    szTmp[cchStr] = '\"';
                     break;
                 case '\\':
-                    aszTmp[cchStr] = '\\';
+                    szTmp[cchStr] = '\\';
                     break;
                 case '/':
-                    aszTmp[cchStr] = '/';
+                    szTmp[cchStr] = '/';
                     break;
                 case '\b':
-                    aszTmp[cchStr] = '\b';
+                    szTmp[cchStr] = '\b';
                     break;
                 case '\n':
-                    aszTmp[cchStr] = '\n';
+                    szTmp[cchStr] = '\n';
                     break;
                 case '\f':
-                    aszTmp[cchStr] = '\f';
+                    szTmp[cchStr] = '\f';
                     break;
                 case '\r':
-                    aszTmp[cchStr] = '\r';
+                    szTmp[cchStr] = '\r';
                     break;
                 case '\t':
-                    aszTmp[cchStr] = '\t';
+                    szTmp[cchStr] = '\t';
                     break;
                 case 'u':
@@ -585 +583 @@
         }
         else
-            aszTmp[cchStr] = ch;
+            szTmp[cchStr] = ch;
         cchStr++;
         rtJsonTokenizerSkipCh(pTokenizer);
@@ -594 +592 @@
         rtJsonTokenizerSkipCh(pTokenizer); /* Skip closing " */
 
-    pToken->Class.String.pszStr = RTStrDupN(&aszTmp[0], cchStr);
+    pToken->Class.String.pszStr = RTStrDupN(&szTmp[0], cchStr);
     if (pToken->Class.String.pszStr)
         pToken->Pos.iChEnd += cchStr;