Changeset 84054 in vbox for trunk/src/VBox/Runtime/win

Timestamp:

Apr 28, 2020 4:05:00 PM (5 years ago)

Author:

vboxsync

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

137633

Message:

IPRT,++: Apply bldprog-strtab.h and friends to the IPRT status message database (errmsg.cpp) to reduce size. The interface (RTErrMsg*) has been reworked as we no longer have C-strings in the database, but 'compressed' string w/o zero terminators. bugref:9726

File:

• trunk/src/VBox/Runtime/win/errmsgwin-sorter.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/win/errmsgwin-sorter.cpp

@@ -39 +39 @@
 
 
+#define ERRMSG_WITH_STRTAB
+#ifdef ERRMSG_WITH_STRTAB
+/*
+ * Include the string table code.
+ */
+# define BLDPROG_STRTAB_MAX_STRLEN           512
+# define BLDPROG_STRTAB_WITH_COMPRESSION
+# define BLDPROG_STRTAB_PURE_ASCII
+# define BLDPROG_STRTAB_WITH_CAMEL_WORDS
+# include <iprt/bldprog-strtab-template.cpp.h>
+#endif
+
+
 /*********************************************************************************************************************************
 *   Defined Constants And Macros                                                                                                 *
@@ -57 +70 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+static const char *g_pszProgName = "errmsgwin-sorter";
 static RTWINERRMSG  g_aStatusMsgs[] =
 {
@@ -67 +81 @@
     { "Success.", "ERROR_SUCCESS", 0 },
 };
+
+
+static RTEXITCODE error(const char *pszFormat,  ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    fprintf(stderr, "%s: error: ", g_pszProgName);
+    vfprintf(stderr, pszFormat, va);
+    va_end(va);
+    return RTEXITCODE_FAILURE;
+}
 
 
@@ -156 +181 @@
     if (pOut)
     {
+#ifdef ERRMSG_WITH_STRTAB
+        /*
+         * String table fun.
+         */
+        static BLDPROGSTRING s_aStrings[RT_ELEMENTS(g_aStatusMsgs) * 2];
+        size_t               iString = 0;
+        BLDPROGSTRTAB        StrTab;
+        if (!BldProgStrTab_Init(&StrTab, RT_ELEMENTS(s_aStrings)))
+            return error("Out of memory!\n");
+#endif
+
         /*
          * Print the table.
@@ -184 +220 @@
             iPrev = pMsg->iCode;
 
+#ifdef ERRMSG_WITH_STRTAB
+# if 1
+            s_aStrings[iString].pszString = strdup(pMsg->pszDefine);
+            BldProgStrTab_AddString(&StrTab, &s_aStrings[iString]);
+            iString++;
+# endif
+# if 0
+            s_aStrings[iString].pszString = strdup(pMsg->pszMsgFull);
+            BldProgStrTab_AddString(&StrTab, &s_aStrings[iString]);
+            iString++;
+# endif
+#endif
+
             /* Produce the output: */
             fprintf(pOut, "/*%#010lx:*/ ENTRY(\"%s\", \"%s\", %ld),\n", (unsigned long)pMsg->iCode,
@@ -197 +246 @@
             rcExit = RTEXITCODE_FAILURE;
         }
+
+#ifdef ERRMSG_WITH_STRTAB
+        /*
+         * More string table fun.
+         */
+        if (!BldProgStrTab_CompileIt(&StrTab, true))
+            return error("BldProgStrTab_CompileIt failed!\n");
+#endif
     }
     else