Changeset 18891 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 14, 2009 2:35:04 PM (16 years ago)

Author:

vboxsync

Message:

VBoxXPCOMCGlue: removed the static variable as per the
suggestion on libvirt list. Check @bugref{2221#161} for
more details.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMCGlue.c (modified) (5 diffs)
• tstXPCOMCCall.c (modified) (1 diff)
• tstXPCOMCGlue.c (modified) (1 diff)

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

@@ -64 +64 @@
 void *g_hVBoxXPCOMC = NULL;
 /** The last load error. */
-char g_szVBoxErrMsg[256];
-/** Pointer to the VBoxXPCOMC function table.  */
 PCVBOXXPCOM g_pVBoxFuncs = NULL;
 /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */
@@ -92 +90 @@
     if (cbBufNeeded > sizeof(szBuf))
     {
-        sprintf(g_szVBoxErrMsg, "path buffer too small: %u bytes needed", (unsigned)cbBufNeeded);
         return -1;
     }
@@ -128 +125 @@
                 rc = 0;
             }
-            else
-                sprintf(g_szVBoxErrMsg, "%.80s: pfnGetFunctions(%#x) failed",
-                        szBuf, VBOX_XPCOMC_VERSION);
         }
-        else
-            sprintf(g_szVBoxErrMsg, "dlsym(%.80s/%.32s): %128s",
-                    szBuf, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
         if (rc != 0)
         {
@@ -141 +132 @@
         }
     }
-    else
-        sprintf(g_szVBoxErrMsg, "dlopen(%.80s): %128s", szBuf, dlerror());
     return rc;
 }
@@ -212 +201 @@
     g_pVBoxFuncs = NULL;
     g_pfnGetFunctions = NULL;
-    memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg));
 }
 

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

@@ -589 +589 @@
     if (VBoxCGlueInit() != 0)
     {
-        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed: %s\n",
-                argv[0], g_szVBoxErrMsg);
+        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed.\n", argv[0]);
         return EXIT_FAILURE;
     }

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

@@ -321 +321 @@
     if (VBoxCGlueInit() != 0)
     {
-        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed: %s\n",
-                argv[0], g_szVBoxErrMsg);
+        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed.\n", argv[0]);
         return EXIT_FAILURE;
     }