Changeset 51770 in vbox for trunk/src/VBox/Runtime/common/err/errinfo.cpp

Timestamp:

Jul 1, 2014 6:14:02 PM (10 years ago)

Author:

vboxsync

Message:

Merged in iprt++ dev branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Runtime/common/err/errinfo.cpp (modified) (5 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Error Info.
+ * IPRT - Error Info, Setters.
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 
 #include <iprt/assert.h>
-#include <iprt/mem.h>
 #include <iprt/string.h>
 
 
-
-RTDECL(PRTERRINFO)  RTErrInfoAlloc(size_t cbMsg)
-{
-    PRTERRINFO pErrInfo;
-    RTErrInfoAllocEx(cbMsg, &pErrInfo);
-    return pErrInfo;
-}
-
-
-RTDECL(int)         RTErrInfoAllocEx(size_t cbMsg, PRTERRINFO *ppErrInfo)
-{
-    if (cbMsg == 0)
-        cbMsg = _4K;
-    else
-        cbMsg = RT_ALIGN_Z(cbMsg, 256);
-
-    PRTERRINFO pErrInfo;
-    *ppErrInfo = pErrInfo = (PRTERRINFO)RTMemTmpAlloc(sizeof(*pErrInfo) + cbMsg);
-    if (RT_UNLIKELY(!pErrInfo))
-        return VERR_NO_TMP_MEMORY;
-
-    RTErrInfoInit(pErrInfo, (char *)(pErrInfo + 1), cbMsg);
-    pErrInfo->fFlags = RTERRINFO_FLAGS_T_ALLOC | RTERRINFO_FLAGS_MAGIC;
-    return VINF_SUCCESS;
-}
-
-
-RTDECL(void)        RTErrInfoFree(PRTERRINFO pErrInfo)
-{
-    RTMemTmpFree(pErrInfo);
-}
-
-
-RTDECL(int)         RTErrInfoSet(PRTERRINFO pErrInfo, int rc, const char *pszMsg)
+RTDECL(int) RTErrInfoSet(PRTERRINFO pErrInfo, int rc, const char *pszMsg)
 {
     if (pErrInfo)
@@ -85 +51 @@
 
 
-RTDECL(int)         RTErrInfoSetF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...)
+RTDECL(int) RTErrInfoSetF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...)
 {
     va_list va;
@@ -95 +61 @@
 
 
-RTDECL(int)         RTErrInfoSetV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va)
+RTDECL(int) RTErrInfoSetV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va)
 {
     if (pErrInfo)
@@ -109 +75 @@
 }
 
+
+RTDECL(int) RTErrInfoAdd(PRTERRINFO pErrInfo, int rc, const char *pszMsg)
+{
+    if (pErrInfo)
+    {
+        AssertPtr(pErrInfo);
+        if (pErrInfo->fFlags & RTERRINFO_FLAGS_SET)
+            RTStrCat(pErrInfo->pszMsg, pErrInfo->cbMsg, pszMsg);
+        else
+        {
+            while (*pszMsg == ' ')
+                pszMsg++;
+            return RTErrInfoSet(pErrInfo, rc, pszMsg);
+        }
+    }
+    return rc;
+}
+
+
+RTDECL(int) RTErrInfoAddF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    RTErrInfoAddV(pErrInfo, rc, pszFormat, va);
+    va_end(va);
+    return rc;
+}
+
+
+RTDECL(int) RTErrInfoAddV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va)
+{
+    if (pErrInfo)
+    {
+        AssertPtr(pErrInfo);
+        Assert((pErrInfo->fFlags & RTERRINFO_FLAGS_MAGIC_MASK) == RTERRINFO_FLAGS_MAGIC);
+        if (pErrInfo->fFlags & RTERRINFO_FLAGS_SET)
+        {
+            char *pszOut = (char *)memchr(pErrInfo->pszMsg, '\0', pErrInfo->cbMsg - 2);
+            if (pszOut)
+                RTStrPrintfV(pszOut, &pErrInfo->pszMsg[pErrInfo->cbMsg] - pszOut, pszFormat, va);
+        }
+        else
+        {
+            while (*pszFormat == ' ')
+                pszFormat++;
+            return RTErrInfoSetV(pErrInfo, rc, pszFormat, va);
+        }
+    }
+    return rc;
+}
+