Changeset 50117 in vbox for trunk/src/VBox/Main/src-server/xpcom

Timestamp:

Jan 20, 2014 2:05:02 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91661

Message:

Main+Frontends: clear out some cruft code, outdated EventQueue stuff and whitespace cleanup

File:

• trunk/src/VBox/Main/src-server/xpcom/server_module.cpp (modified) (13 diffs)

trunk/src/VBox/Main/src-server/xpcom/server_module.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -92 +92 @@
  */
 
-NS_DECL_CLASSINFO (VirtualBox)
-NS_IMPL_CI_INTERFACE_GETTER1 (VirtualBox, IVirtualBox)
+NS_DECL_CLASSINFO(VirtualBox)
+NS_IMPL_CI_INTERFACE_GETTER1(VirtualBox, IVirtualBox)
 
 static nsresult vboxsvcSpawnDaemon(void)
@@ -168 +168 @@
  */
 static NS_IMETHODIMP
-VirtualBoxConstructor (nsISupports *aOuter, REFNSIID aIID,
-                       void **aResult)
+VirtualBoxConstructor(nsISupports *aOuter, REFNSIID aIID,
+                      void **aResult)
 {
     LogFlowFuncEnter();
@@ -189 +189 @@
             /* Get the directory containing XPCOM components -- the VBoxSVC
              * executable is expected in the parent directory. */
-            nsCOMPtr <nsIProperties> dirServ = do_GetService (NS_DIRECTORY_SERVICE_CONTRACTID, &rc);
+            nsCOMPtr<nsIProperties> dirServ = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rc);
             if (NS_SUCCEEDED(rc))
             {
-                nsCOMPtr <nsIFile> componentDir;
-                rc = dirServ->Get (NS_XPCOM_COMPONENT_DIR,
-                                   NS_GET_IID (nsIFile), getter_AddRefs (componentDir));
+                nsCOMPtr<nsIFile> componentDir;
+                rc = dirServ->Get(NS_XPCOM_COMPONENT_DIR,
+                                  NS_GET_IID(nsIFile), getter_AddRefs(componentDir));
 
                 if (NS_SUCCEEDED(rc))
                 {
                     nsCAutoString path;
-                    componentDir->GetNativePath (path);
-
-                    LogFlowFunc (("component directory = \"%s\"\n", path.get()));
-                    AssertBreakStmt (path.Length() + strlen (VBoxSVC_exe) < RTPATH_MAX,
-                                     rc = NS_ERROR_FAILURE);
+                    componentDir->GetNativePath(path);
+
+                    LogFlowFunc(("component directory = \"%s\"\n", path.get()));
+                    AssertBreakStmt(path.Length() + strlen(VBoxSVC_exe) < RTPATH_MAX,
+                                    rc = NS_ERROR_FAILURE);
 
 #if defined(RT_OS_SOLARIS) && defined(VBOX_WITH_HARDENING)
                     char achKernArch[128];
-                    int cbKernArch = sysinfo (SI_ARCHITECTURE_K, achKernArch, sizeof(achKernArch));
+                    int cbKernArch = sysinfo(SI_ARCHITECTURE_K, achKernArch, sizeof(achKernArch));
                     if (cbKernArch > 0)
                     {
@@ -216 +216 @@
                         rc = NS_ERROR_UNEXPECTED;
 #else
-                    strcpy (VBoxSVCPath, path.get());
-                    RTPathStripFilename (VBoxSVCPath);
-                    strcat (VBoxSVCPath, VBoxSVC_exe);
+                    strcpy(VBoxSVCPath, path.get());
+                    RTPathStripFilename(VBoxSVCPath);
+                    strcat(VBoxSVCPath, VBoxSVC_exe);
 
                     IsVBoxSVCPathSet = true;
@@ -228 +228 @@
         }
 
-        nsCOMPtr <ipcIService> ipcServ = do_GetService (IPC_SERVICE_CONTRACTID, &rc);
+        nsCOMPtr<ipcIService> ipcServ = do_GetService(IPC_SERVICE_CONTRACTID, &rc);
         if (NS_FAILED(rc))
             break;
@@ -239 +239 @@
         do
         {
-            LogFlowFunc (("Resolving server name \"%s\"...\n", VBOXSVC_IPC_NAME));
+            LogFlowFunc(("Resolving server name \"%s\"...\n", VBOXSVC_IPC_NAME));
 
             PRUint32 serverID = 0;
-            rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
+            rc = ipcServ->ResolveClientName(VBOXSVC_IPC_NAME, &serverID);
             if (NS_FAILED(rc))
             {
-                LogFlowFunc (("Starting server \"%s\"...\n", VBoxSVCPath));
+                LogFlowFunc(("Starting server \"%s\"...\n", VBoxSVCPath));
 
                 startedOnce = true;
@@ -256 +256 @@
                 do
                 {
-                    RTThreadSleep (VBoxSVC_WaitSlice);
-                    rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
+                    RTThreadSleep(VBoxSVC_WaitSlice);
+                    rc = ipcServ->ResolveClientName(VBOXSVC_IPC_NAME, &serverID);
                     if (NS_SUCCEEDED(rc))
                         break;
@@ -276 +276 @@
             }
 
-            LogFlowFunc (("Connecting to server (ID=%d)...\n", serverID));
-
-            nsCOMPtr <ipcIDConnectService> dconServ =
-                do_GetService (IPC_DCONNECTSERVICE_CONTRACTID, &rc);
+            LogFlowFunc(("Connecting to server (ID=%d)...\n", serverID));
+
+            nsCOMPtr<ipcIDConnectService> dconServ =
+                do_GetService(IPC_DCONNECTSERVICE_CONTRACTID, &rc);
             if (NS_FAILED(rc))
                 break;
 
-            rc = dconServ->CreateInstance (serverID,
-                                           CLSID_VirtualBox,
-                                           aIID, aResult);
+            rc = dconServ->CreateInstance(serverID,
+                                          CLSID_VirtualBox,
+                                          aIID, aResult);
             if (NS_SUCCEEDED(rc))
                 break;
 
-            LogFlowFunc (("Failed to connect (rc=%Rhrc (%#08x))\n", rc, rc));
+            LogFlowFunc(("Failed to connect (rc=%Rhrc (%#08x))\n", rc, rc));
 
             /* It's possible that the server gets shut down after we
@@ -298 +298 @@
             {
                 nsresult rc2 =
-                    ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
+                    ipcServ->ResolveClientName(VBOXSVC_IPC_NAME, &serverID);
                 if (NS_SUCCEEDED(rc2))
                     break;
 
-                LogFlowFunc (("Server seems to have terminated before "
-                              "receiving our request. Will try again.\n"));
+                LogFlowFunc(("Server seems to have terminated before receiving our request. Will try again.\n"));
             }
             else
@@ -312 +311 @@
     while (0);
 
-    LogFlowFunc (("rc=%Rhrc (%#08x), vrc=%Rrc\n", rc, rc, vrc));
+    LogFlowFunc(("rc=%Rhrc (%#08x), vrc=%Rrc\n", rc, rc, vrc));
     LogFlowFuncLeave();
 
@@ -331 +330 @@
  */
 static NS_IMETHODIMP
-VirtualBoxRegistration (nsIComponentManager *aCompMgr,
-                        nsIFile *aPath,
-                        const char *aLoaderStr,
-                        const char *aType,
-                        const nsModuleComponentInfo *aInfo)
+VirtualBoxRegistration(nsIComponentManager *aCompMgr,
+                       nsIFile *aPath,
+                       const char *aLoaderStr,
+                       const char *aType,
+                       const nsModuleComponentInfo *aInfo)
 {
     nsCAutoString modulePath;
-    aPath->GetNativePath (modulePath);
+    aPath->GetNativePath(modulePath);
     nsCAutoString moduleTarget;
-    aPath->GetNativeTarget (moduleTarget);
-
-    LogFlowFunc (("aPath=%s, aTarget=%s, aLoaderStr=%s, aType=%s\n",
-                  modulePath.get(), moduleTarget.get(), aLoaderStr, aType));
+    aPath->GetNativeTarget(moduleTarget);
+
+    LogFlowFunc(("aPath=%s, aTarget=%s, aLoaderStr=%s, aType=%s\n",
+                 modulePath.get(), moduleTarget.get(), aLoaderStr, aType));
 
     nsresult rc = NS_OK;
@@ -372 +371 @@
 };
 
-NS_IMPL_NSGETMODULE (VirtualBox_Server_Module, components)
+NS_IMPL_NSGETMODULE(VirtualBox_Server_Module, components)