Changeset 19052 in vbox

Timestamp:

Apr 21, 2009 9:13:46 AM (16 years ago)

Author:

vboxsync

Message:

VBoxXPCOMCGlue.c: dlopen errors are less important than the other ones.

File:

• trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c (modified) (5 diffs)

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c

@@ -71 +71 @@
  * Wrapper for setting g_szVBoxErrMsg. Can be an empty stub.
  *
+ * @param   fAlways         When 0 the g_szVBoxErrMsg is only set if empty.
  * @param   pszFormat       The format string.
  * @param   ...             The arguments.
  */
-static void setErrMsg(const char *pszFormat, ...)
-{
-    va_list va;
-    va_start(va, pszFormat);
-    vsnprintf(g_szVBoxErrMsg, sizeof(g_szVBoxErrMsg), pszFormat, va);
-    va_end(va);
+static void setErrMsg(int fAlways, const char *pszFormat, ...)
+{
+    if (    fAlways
+        ||  !g_szVBoxErrMsg[0])
+    {
+        va_list va;
+        va_start(va, pszFormat);
+        vsnprintf(g_szVBoxErrMsg, sizeof(g_szVBoxErrMsg), pszFormat, va);
+        va_end(va);
+    }
 }
 
@@ -106 +111 @@
     if (cbBufNeeded > sizeof(szName))
     {
-        setErrMsg("path buffer too small: %u bytes needed",
+        setErrMsg(1, "path buffer too small: %u bytes needed",
                   (unsigned)cbBufNeeded);
         return -1;
@@ -145 +150 @@
 
             /* bail out */
-            setErrMsg("%.80s: pfnGetFunctions(%#x) failed",
+            setErrMsg(1, "%.80s: pfnGetFunctions(%#x) failed",
                       szName, VBOX_XPCOMC_VERSION);
         }
         else
-            setErrMsg("dlsym(%.80s/%.32s): %.128s",
+            setErrMsg(1, "dlsym(%.80s/%.32s): %.128s",
                       szName, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
         dlclose(g_hVBoxXPCOMC);
@@ -155 +160 @@
     }
     else
-        setErrMsg("dlopen(%.80s): %.160s", szName, dlerror());
+        setErrMsg(0, "dlopen(%.80s): %.160s", szName, dlerror());
     return rc;
 }
@@ -183 +188 @@
      * Try the known standard locations.
      */
+    g_szVBoxErrMsg[0] = '\0';
 #if defined(__gnu__linux__) || defined(__linux__)
     if (tryLoadOne("/opt/VirtualBox", 1) == 0)