Changeset 83984 in vbox for trunk/src/VBox/Runtime/common/err

Timestamp:

Apr 27, 2020 12:17:19 AM (5 years ago)

Author:

vboxsync

Message:

IPRT: Reduce the amoung of strings in errmsg and errmsgwin in static builds (IN_RT_STATIC). The windows ones are almost never used anywhere anyways.

Location:

trunk/src/VBox/Runtime/common/err

Files:

• errmsg-sorter.cpp (modified) (1 diff)
• errmsg.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/err/errmsg-sorter.cpp

@@ -205 +205 @@
 
             /* Produce the output: */
-            fprintf(pOut, "/*%8d:*/ { \"%s\", \"%s\", \"%s\", %s },\n",
+            fprintf(pOut, "/*%8d:*/ ENTRY(\"%s\", \"%s\", \"%s\", %s),\n",
                     pMsg->iCode,
                     EscapeString(pMsg->pszMsgShort, s_szMsgTmp1, sizeof(s_szMsgTmp1)),
                     EscapeString(pMsg->pszMsgFull, s_szMsgTmp2, sizeof(s_szMsgTmp2)),
                     pMsg->pszDefine, pMsg->pszDefine);
+
         }
 

trunk/src/VBox/Runtime/common/err/errmsg.cpp

@@ -35 +35 @@
 #include <iprt/string.h>
 #include <VBox/err.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#ifdef IPRT_ERRMSG_DEFINES_ONLY
+# define ENTRY(a_pszMsgShort, a_pszMsgFull, a_pszDefine, a_iCode) \
+    { a_pszDefine, a_pszDefine, a_pszDefine, a_iCode }
+#elif defined(IN_RT_STATIC) /* Skip the full message in static builds to save space. */
+# define ENTRY(a_pszMsgShort, a_pszMsgFull, a_pszDefine, a_iCode) \
+    { a_pszMsgShort, a_pszMsgShort, a_pszDefine, a_iCode }
+#else
+# define ENTRY(a_pszMsgShort, a_pszMsgFull, a_pszDefine, a_iCode) \
+    { a_pszMsgShort, a_pszMsgFull, a_pszDefine, a_iCode }
+#endif