Changeset 83166 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Feb 26, 2020 11:16:55 PM (5 years ago)

Author:

vboxsync

Message:

iprt/string.h: Adding %RTeic and %RTeim format types for handling RTERRINFO more efficiently.

File:

• trunk/src/VBox/Runtime/common/string/strformatrt.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -273 +273 @@
                     RTSF_MAC,
                     RTSF_NETADDR,
-                    RTSF_UUID
+                    RTSF_UUID,
+                    RTSF_ERRINFO,
+                    RTSF_ERRINFO_MSG_ONLY
                 } RTSF;
                 static const struct
@@ -313 +315 @@
                     { STRMEM("Rv"),      sizeof(RTRCPTR),        16, RTSF_INTW,  0 },
                     { STRMEM("Tbool"),   sizeof(bool),           10, RTSF_BOOL,  0 },
+                    { STRMEM("Teic"),    sizeof(PCRTERRINFO),    16, RTSF_ERRINFO, 0 },
+                    { STRMEM("Teim"),    sizeof(PCRTERRINFO),    16, RTSF_ERRINFO_MSG_ONLY, 0 },
                     { STRMEM("Tfile"),   sizeof(RTFILE),         10, RTSF_INT,   0 },
                     { STRMEM("Tfmode"),  sizeof(RTFMODE),        16, RTSF_INTW,  0 },
@@ -379 +383 @@
                     PCRTNETADDR         pNetAddr;
                     PCRTUUID            pUuid;
+                    PCRTERRINFO         pErrInfo;
                 } u;
 
@@ -657 +662 @@
                         }
                         return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
+                    }
+
+                    case RTSF_ERRINFO:
+                    case RTSF_ERRINFO_MSG_ONLY:
+                    {
+                        if (VALID_PTR(u.pErrInfo) && RTErrInfoIsSet(u.pErrInfo))
+                        {
+                            cch = 0;
+                            if (s_aTypes[i].enmFormat == RTSF_ERRINFO)
+                            {
+#ifdef IN_RING3                         /* we don't want this anywhere else yet. */
+                                PCRTSTATUSMSG pMsg = RTErrGet(u.pErrInfo->rc);
+                                cch += pfnOutput(pvArgOutput, pMsg->pszMsgShort, strlen(pMsg->pszMsgShort));
+#else
+                                cch += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%d", u.pErrInfo->rc);
+#endif
+                            }
+
+                            if (u.pErrInfo->cbMsg > 0)
+                            {
+                                if (fFlags & RTSTR_F_SPECIAL)
+                                    cch = pfnOutput(pvArgOutput, RT_STR_TUPLE(" - "));
+                                else
+                                    cch = pfnOutput(pvArgOutput, RT_STR_TUPLE(": "));
+                                cch += pfnOutput(pvArgOutput, u.pErrInfo->pszMsg, u.pErrInfo->cbMsg);
+                            }
+                            return cch;
+                        }
+                        return 0;
                     }