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

Timestamp:

Apr 17, 2020 12:33:33 PM (5 years ago)

Author:

vboxsync

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

137266

Message:

IPRT: Sort IPRT status messages so we can look them up using binary searching. bugref:8489

Location:

trunk/src/VBox/Runtime/win

Files:

• errmsgwin-sorter.cpp (modified) (2 diffs)
• errmsgwin.cpp (modified) (1 diff)

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

@@ -85 +85 @@
 
 
+/**
+ * Escapes @a pszString using @a pszBuf as needed.
+ * @note Duplicated in errmsg-sorter.cpp.
+ */
+static const char *EscapeString(const char *pszString, char *pszBuf, size_t cbBuf)
+{
+    if (strpbrk(pszString, "\n\t\r\"\\") == NULL)
+        return pszString;
+
+    char *pszDst = pszBuf;
+    char  ch;
+    do
+    {
+        ch = *pszString++;
+        switch (ch)
+        {
+            default:
+                *pszDst++ = ch;
+                break;
+            case '\\':
+            case '"':
+                *pszDst++ = '\\';
+                *pszDst++ = ch;
+                break;
+            case '\n':
+                *pszDst++ = '\\';
+                *pszDst++ = 'n';
+                break;
+            case '\t':
+                *pszDst++ = '\\';
+                *pszDst++ = 't';
+                break;
+            case '\r':
+                break; /* drop it */
+        }
+    } while (ch);
+
+    if ((uintptr_t)(pszDst - pszBuf) > cbBuf)
+        fprintf(stderr, "Escape buffer overrun!\n");
+
+    return pszBuf;
+}
+
+
 int main(int argc, char **argv)
 {
@@ -138 +182 @@
             iPrev = pMsg->iCode;
 
-            /* Make sure the message string doesn't contain problematic characters: */
-            const char *pszMsgFull = pMsg->pszMsgFull;
-            if (strpbrk(pszMsgFull, "\"\\"))
-            {
-                char *pszDst = s_szMsgTmp;
-                char  ch;
-                do
-                {
-                    ch = *pszMsgFull++;
-                    if (ch == '\\' || ch == '"')
-                        *pszDst++ = '\\';
-                    *pszDst++ = ch;
-                } while (ch);
-                pszMsgFull = s_szMsgTmp;
-            }
-
             /* Produce the output: */
-            fprintf(pOut, "/*%#010lx:*/ { \"%s\", \"%s\", %ld },\n",
-                    (unsigned long)pMsg->iCode, pszMsgFull, pMsg->pszDefine, pMsg->iCode);
+            fprintf(pOut, "/*%#010lx:*/ { \"%s\", \"%s\", %ld },\n", (unsigned long)pMsg->iCode,
+                    EscapeString(pMsg->pszMsgFull, s_szMsgTmp, sizeof(s_szMsgTmp)), pMsg->pszDefine, pMsg->iCode);
         }
 

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

@@ -81 +81 @@
 {
     /*
-     * Perform binary search.
+     * Perform binary search (duplicate code in RTErrGet).
      */
     size_t iStart = 0;