Changeset 46737 in vbox

Timestamp:

Jun 23, 2013 12:11:45 PM (12 years ago)

Author:

vboxsync

Message:

FE/VBoxAutostart: Todos and comments

File:

• trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartCfg.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartCfg.cpp

@@ -381 +381 @@
 }
 
-static const char *autostartConfigTokenToString(PCFGTOKEN pToken)
-{
-    switch (pToken->enmType)
+/**
+ * Returns a stringified version of the token type.
+ *
+ * @returns Stringified version of the token type.
+ * @param   enmType         Token type.
+ */
+static const char *autostartConfigTokenTypeToStr(CFGTOKENTYPE enmType)
+{
+    switch (enmType)
     {
         case CFGTOKENTYPE_COMMA:
@@ -396 +402 @@
             return "<EOF>";
         case CFGTOKENTYPE_ID:
-            return pToken->u.Id.achToken;
+            return "<Identifier>";
         default:
             AssertFailed();
@@ -406 +412 @@
 }
 
+/**
+ * Returns a stringified version of the token.
+ *
+ * @returns Stringified version of the token type.
+ * @param   pToken         Token.
+ */
+static const char *autostartConfigTokenToString(PCFGTOKEN pToken)
+{
+    if (pToken->enmType == CFGTOKENTYPE_ID)
+        return pToken->u.Id.achToken;
+    else
+        return autostartConfigTokenTypeToStr(pToken->enmType);
+}
+
+/**
+ * Returns the length of the token in characters (without zero terminator).
+ *
+ * @returns Token length.
+ * @param   pToken          Token.
+ */
 static size_t autostartConfigTokenGetLength(PCFGTOKEN pToken)
 {
@@ -428 +454 @@
 }
 
+/**
+ * Log unexpected token error.
+ *
+ * @returns nothing.
+ * @param   pToken          The token which caused the error.
+ * @param   pszExpected     String of the token which was expected.
+ */
 static void autostartConfigTokenizerMsgUnexpectedToken(PCFGTOKEN pToken, const char *pszExpected)
 {
-    RTMsgError("Unexpected token '%s' at %d:%d.%d, expected '%s'",
-               autostartConfigTokenToString(pToken),
-               pToken->iLine, pToken->cchStart,
-               pToken->cchStart + autostartConfigTokenGetLength(pToken) - 1, pszExpected);
+    autostartSvcLogError("Unexpected token '%s' at %d:%d.%d, expected '%s'",
+                         autostartConfigTokenToString(pToken),
+                         pToken->iLine, pToken->cchStart,
+                         pToken->cchStart + autostartConfigTokenGetLength(pToken) - 1, pszExpected);
 }
 
@@ -453 +486 @@
         if (pCfgToken->enmType != enmType)
         {
-            autostartConfigTokenizerMsgUnexpectedToken(pCfgToken, "@todo");
+            autostartConfigTokenizerMsgUnexpectedToken(pCfgToken, autostartConfigTokenTypeToStr(enmType));
             rc = VERR_INVALID_PARAMETER;
         }
@@ -570 +603 @@
 
     pCfgAst->enmType = CFGASTNODETYPE_COMPOUND;
+    pCfgAst->u.Compound.cAstNodes = 0;
     pCfgAst->pszKey  = RTStrDup(pszScopeId);
     if (!pCfgAst->pszKey)
@@ -619 +653 @@
         if (RT_SUCCESS(rc))
         {
-            Assert(idxAstNodeCur < cAstNodesMax);
-            pCfgAst->u.Compound.apAstNodes[idxAstNodeCur] = pAstNode;
-            idxAstNodeCur++;
-            /** @todo: realloc if array is getting to small. */
+            if (pCfgAst->u.Compound.cAstNodes >= cAstNodesMax)
+            {
+                cAstNodesMax += 10;
+
+                PCFGAST pCfgAstNew = (PCFGAST)RTMemRealloc(pCfgAst, RT_OFFSETOF(CFGAST, u.Compound.apAstNodes[cAstNodesMax]));
+                if (!pCfgAstNew)
+                    rc = VERR_NO_MEMORY;
+                else
+                    pCfgAst = pCfgAstNew;
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                pCfgAst->u.Compound.apAstNodes[pCfgAst->u.Compound.cAstNodes] = pAstNode;
+                pCfgAst->u.Compound.cAstNodes++;
+            }
         }
 
@@ -630 +676 @@
 
     if (RT_SUCCESS(rc))
-    {
-        pCfgAst->u.Compound.cAstNodes = idxAstNodeCur;
         *ppCfgAst = pCfgAst;
-    }
     else
         autostartConfigAstDestroy(pCfgAst);