Changeset 21878 in vbox for trunk/src/VBox/Main/xpcom

Timestamp:

Jul 30, 2009 12:42:08 PM (16 years ago)

Author:

vboxsync

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

50525

Message:

Main: coding style: have Main obey the standard VirtualBox coding style rules (no functional changes)

Location:

trunk/src/VBox/Main/xpcom

Files:

• server.cpp (modified) (6 diffs)
• server_module.cpp (modified) (6 diffs)

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

@@ -269 +269 @@
     nsresult postTo (nsIEventQueue *aEventQ)
     {
-        AssertReturn (mEv.that == NULL, NS_ERROR_FAILURE);
-        AssertReturn (aEventQ, NS_ERROR_FAILURE);
+        AssertReturn(mEv.that == NULL, NS_ERROR_FAILURE);
+        AssertReturn(aEventQ, NS_ERROR_FAILURE);
         nsresult rv = aEventQ->InitEvent (&mEv.e, NULL,
                                           eventHandler, eventDestructor);
-        if (NS_SUCCEEDED (rv))
+        if (NS_SUCCEEDED(rv))
         {
             mEv.that = this;
             rv = aEventQ->PostEvent (&mEv.e);
-            if (NS_SUCCEEDED (rv))
+            if (NS_SUCCEEDED(rv))
                 return rv;
         }
@@ -358 +358 @@
                 int vrc = RTTimerLRStart (sTimer, uint64_t (VBoxSVC_ShutdownDelay) * 1000000);
                 AssertRC (vrc);
-                timerStarted = SUCCEEDED (vrc);
+                timerStarted = SUCCEEDED(vrc);
             }
             else
@@ -476 +476 @@
 
         /* create a critsect to protect object construction */
-        if (RT_FAILURE (RTCritSectInit (&sLock)))
+        if (RT_FAILURE(RTCritSectInit (&sLock)))
             return NS_ERROR_OUT_OF_MEMORY;
 
         int vrc = RTTimerLRCreateEx (&sTimer, 0, 0, ShutdownTimer, NULL);
-        if (RT_FAILURE (vrc))
+        if (RT_FAILURE(vrc))
         {
             LogFlowFunc (("Failed to create a timer! (vrc=%Rrc)\n", vrc));
@@ -696 +696 @@
                         const nsModuleComponentInfoEx *info)
 {
-    AssertReturn (result, NS_ERROR_INVALID_POINTER);
+    AssertReturn(result, NS_ERROR_INVALID_POINTER);
 
     nsresult rv = NS_NewGenericFactory (result, info);
-    if (NS_SUCCEEDED (rv) && info && info->mFactoryConstructor)
+    if (NS_SUCCEEDED(rv) && info && info->mFactoryConstructor)
     {
         rv = info->mFactoryConstructor();
@@ -722 +722 @@
     nsresult rc = NS_OK;
     const nsModuleComponentInfoEx *info = components;
-    for (PRUint32 i = 0; i < count && NS_SUCCEEDED (rc); i++, info++)
+    for (PRUint32 i = 0; i < count && NS_SUCCEEDED(rc); i++, info++)
     {
         /* skip components w/o a constructor */
@@ -729 +729 @@
         nsIGenericFactory *factory;
         rc = NS_NewGenericFactoryEx (&factory, info);
-        if (NS_SUCCEEDED (rc))
+        if (NS_SUCCEEDED(rc))
         {
             rc = registrar->RegisterFactory (info->mCID,

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

@@ -126 +126 @@
              * executable is expected in the parent directory. */
             nsCOMPtr <nsIProperties> dirServ = do_GetService (NS_DIRECTORY_SERVICE_CONTRACTID, &rc);
-            if (NS_SUCCEEDED (rc))
+            if (NS_SUCCEEDED(rc))
             {
                 nsCOMPtr <nsIFile> componentDir;
@@ -132 +132 @@
                                    NS_GET_IID (nsIFile), getter_AddRefs (componentDir));
 
-                if (NS_SUCCEEDED (rc))
+                if (NS_SUCCEEDED(rc))
                 {
                     nsCAutoString path;
@@ -201 +201 @@
                 RTPROCESS pid = NIL_RTPROCESS;
                 vrc = RTProcCreate (VBoxSVCPath, args, RTENV_DEFAULT, 0, &pid);
-                if (RT_FAILURE (vrc))
+                if (RT_FAILURE(vrc))
                 {
                     rc = NS_ERROR_FAILURE;
@@ -213 +213 @@
                     RTThreadSleep (VBoxSVC_WaitSlice);
                     rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
-                    if (NS_SUCCEEDED (rc))
+                    if (NS_SUCCEEDED(rc))
                         break;
                     if (timeLeft <= VBoxSVC_WaitSlice)
@@ -241 +241 @@
                                            (nsCID) NS_VIRTUALBOX_CID,
                                            aIID, aResult);
-            if (NS_SUCCEEDED (rc))
+            if (NS_SUCCEEDED(rc))
                 break;
 
@@ -254 +254 @@
                 nsresult rc2 =
                     ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
-                if (NS_SUCCEEDED (rc2))
+                if (NS_SUCCEEDED(rc2))
                     break;