Changeset 84054 in vbox for trunk/src/VBox/VMM

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

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGFReg.cpp (modified) (2 diffs)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/DBGFReg.cpp

@@ -2392 +2392 @@
     if (RT_FAILURE(rc))
     {
-        PCRTSTATUSMSG pErr = RTErrGet(rc);
-        if (pErr)
-            return pfnOutput(pvArgOutput, pErr->pszDefine, strlen(pErr->pszDefine));
-        return pfnOutput(pvArgOutput, szTmp, RTStrPrintf(szTmp, sizeof(szTmp), "rc=%d", rc));
+        ssize_t cchDefine = RTErrQueryDefine(rc, szTmp, sizeof(szTmp), true /*fFailIfUnknown*/);
+        if (cchDefine <= 0)
+            cchDefine = RTStrPrintf(szTmp, sizeof(szTmp), "rc=%d", rc);
+        return pfnOutput(pvArgOutput, szTmp, cchDefine);
     }
 
@@ -2485 +2485 @@
     if (RT_FAILURE(rc))
     {
-        PCRTSTATUSMSG pErr = RTErrGet(rc);
-        if (pErr)
-            return pfnOutput(pvArgOutput, pErr->pszDefine, strlen(pErr->pszDefine));
-        return pfnOutput(pvArgOutput, szTmp, RTStrPrintf(szTmp, sizeof(szTmp), "rc=%d", rc));
+        ssize_t cchDefine = RTErrQueryDefine(rc, szTmp, sizeof(szTmp), true /*fFailIfUnknown*/);
+        if (cchDefine <= 0)
+            cchDefine = RTStrPrintf(szTmp, sizeof(szTmp), "rc=%d", rc);
+        return pfnOutput(pvArgOutput, szTmp, cchDefine);
     }
 

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -310 +310 @@
                 default:
                     if (VMR3GetErrorCount(pUVM) == 0)
-                        pszError = RTErrGetFull(rc);
+                    {
+                        pszError = (char *)alloca(1024);
+                        RTErrQueryMsgFull(rc, (char *)pszError, 1024, false /*fFailIfUnknown*/);
+                    }
                     else
                         pszError = NULL; /* already set. */