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

Timestamp:

Mar 13, 2009 12:22:52 PM (16 years ago)

Author:

vboxsync

Message:

Cbinding: integrated the glue code in libvirt so that
the files are exact copies in vbox and libvirt.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMCGlue.c (modified) (9 diffs)
• VBoxXPCOMCGlue.h (modified) (1 diff)
• tstXPCOMCGlue.c (modified) (1 diff)

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

@@ -52 +52 @@
 #endif
 
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
 /** The dlopen handle for VBoxXPCOMC. */
 void *g_hVBoxXPCOMC = NULL;
@@ -72 +68 @@
  * @returns 0 on success, -1 on failure.
  * @param   pszHome         The director where to try load VBoxXPCOMC from. Can be NULL.
- * @param   pszMsgPrefix    Error message prefix. NULL means no error messages.
  */
-static int tryLoadOne(const char *pszHome, const char *pszMsgPrefix)
+static int tryLoadOne(const char *pszHome)
 {
     size_t      cchHome = pszHome ? strlen(pszHome) : 0;
@@ -89 +84 @@
     {
         sprintf(g_szVBoxErrMsg, "malloc(%u) failed", (unsigned)cbBuf);
-        if (pszMsgPrefix)
-            fprintf(stderr, "%s%s\n", pszMsgPrefix, g_szVBoxErrMsg);
         return -1;
     }
@@ -143 +136 @@
  *
  * @returns 0 on success, -1 on failure.
- * @param   pszMsgPrefix    Error message prefix. NULL means no error messages.
  *
  * @remark  This should be considered moved into a separate glue library since
@@ -150 +142 @@
  *          source code all around the place.
  */
-int VBoxCGlueInit(const char *pszMsgPrefix)
+int VBoxCGlueInit(void)
 {
     /*
@@ -157 +149 @@
     const char *pszHome = getenv("VBOX_APP_HOME");
     if (pszHome)
-        return tryLoadOne(pszHome, pszMsgPrefix);
+        return tryLoadOne(pszHome);
 
     /*
@@ -163 +155 @@
      */
 #if defined(__gnu__linux__) || defined(__linux__)
-    if (tryLoadOne("/opt/VirtualBox", pszMsgPrefix) == 0)
+    if (tryLoadOne("/opt/VirtualBox") == 0)
         return 0;
-    if (tryLoadOne("/usr/lib/virtualbox", pszMsgPrefix) == 0)
+    if (tryLoadOne("/usr/lib/virtualbox") == 0)
         return 0;
 #elif defined(__sun__)
-    if (tryLoadOne("/opt/VirtualBox/amd64", pszMsgPrefix) == 0)
+    if (tryLoadOne("/opt/VirtualBox/amd64") == 0)
         return 0;
-    if (tryLoadOne("/opt/VirtualBox/i386", pszMsgPrefix) == 0)
+    if (tryLoadOne("/opt/VirtualBox/i386") == 0)
         return 0;
 #elif defined(__APPLE__)
@@ -182 +174 @@
      * Finally try the dynamic linker search path.
      */
-    if (tryLoadOne(NULL, pszMsgPrefix) == 0)
+    if (tryLoadOne(NULL) == 0)
         return 0;
 
     /* No luck, return failure. */
-    if (pszMsgPrefix)
-        fprintf(stderr, "%sFailed to locate VBoxXPCOMC\n", pszMsgPrefix);
     return -1;
 }
-
 
 /**
@@ -204 +193 @@
     g_pVBoxFuncs = NULL;
     g_pfnGetFunctions = NULL;
+    memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg));
 }
-

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

@@ -48 +48 @@
 
 
-int VBoxCGlueInit(const char *pszMsgPrefix);
+int VBoxCGlueInit(void);
 void VBoxCGlueTerm(void);
 

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

@@ -319 +319 @@
      */
 
-    if (VBoxCGlueInit(NULL) != 0)
+    if (VBoxCGlueInit() != 0)
     {
         fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed: %s\n",