Changeset 93191 in vbox for trunk

Timestamp:

Jan 11, 2022 11:25:35 PM (3 years ago)

Author:

vboxsync

Message:

Main/UnattendedScript: Added @@VBOX_INSERT[expr]@@ and @@VBOX_COND[expr]@@, merging the variable & condition lookup with the previous replacement getter. Added simple testcase for checking the basics. [build fixes] bugref:9781

File:

• trunk/src/VBox/Main/src-server/UnattendedScript.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/UnattendedScript.cpp

@@ -119 +119 @@
             size_t       cchPlaceholder    = sizeof(g_szPrefix) - 1;
             char         ch;
-            while (   offPlaceholder + cchPlaceholder < cchTemplate
+            while (   offPlaceholder + cchPlaceholder < cchMaxPlaceholder
                    && (ch = pszPlaceholder[cchPlaceholder]) != '\0'
                    && (RT_C_IS_PRINT(ch) || RT_C_IS_SPACE(ch))
@@ -338 +338 @@
      * Check for an escaping suffix.  Drop the '@@'.
      */
-    size_t const    cchFullPlaceholder = cchPlaceholder;
     kEvalEscaping_T enmEscaping;
 #define PLACEHOLDER_ENDS_WITH(a_szSuffix) \
@@ -467 +466 @@
      * @@VBOX_INSERT[expr]ATTRIB_DQ@@:
      */
-    size_t const    cchFullPlaceholder = cchPlaceholder;
     kEvalEscaping_T enmEscaping;
 #define PLACEHOLDER_ENDS_WITH(a_szSuffix) \
@@ -591 +589 @@
 
 /*static */ DECLCALLBACK(int)
-UnattendedScriptTemplate::queryVariableForExpr(const char *pchName, size_t cchName, void *pvUser, char **ppszValue)
+UnattendedScriptTemplate::queryVariableForExpr(const char *pchName, size_t cchName, void *pvUser, char **ppszValue) RT_NOEXCEPT
 {
     UnattendedScriptTemplate *pThis = (UnattendedScriptTemplate *)pvUser;