Changeset 27905 in vbox

Timestamp:

Mar 31, 2010 2:19:30 PM (14 years ago)

Author:

vboxsync

Message:

Main: coding style

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplExport.cpp (modified) (6 diffs)
• ApplianceImplImport.cpp (modified) (9 diffs)
• DisplayImpl.cpp (modified) (3 diffs)
• VFSExplorerImpl.cpp (modified) (5 diffs)
• darwin/HostPowerDarwin.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1593 +1593 @@
 
         vrc = RTPathExists(strTmpOvf.c_str()); /* Paranoid check */
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             throw setError(VBOX_E_FILE_ERROR,
                            tr("Cannot find source file '%s'"), strTmpOvf.c_str());
@@ -1621 +1621 @@
                 strTargetFilePath.append(strTargetFileNameOnly);
                 vrc = RTPathExists(strTargetFilePath.c_str()); /* Paranoid check */
-                if(RT_FAILURE(vrc))
+                if (RT_FAILURE(vrc))
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Cannot find source file '%s'"), strTargetFilePath.c_str());
@@ -1629 +1629 @@
         /* Next we have to upload the OVF & all disk images */
         vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
                            tr("Cannot create S3 service handler"));
@@ -1645 +1645 @@
             if (RT_FAILURE(vrc))
             {
-                if(vrc == VERR_S3_CANCELED)
+                if (vrc == VERR_S3_CANCELED)
                     break;
-                else if(vrc == VERR_S3_ACCESS_DENIED)
+                else if (vrc == VERR_S3_ACCESS_DENIED)
                     throw setError(E_ACCESSDENIED,
                                    tr("Cannot upload file '%s' to S3 storage server (Access denied). Make sure that your credentials are right. Also check that your host clock is properly synced"), pszFilename);
-                else if(vrc == VERR_S3_NOT_FOUND)
+                else if (vrc == VERR_S3_NOT_FOUND)
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Cannot upload file '%s' to S3 storage server (File not found)"), pszFilename);
@@ -1672 +1672 @@
         {
             vrc = RTFileDelete(pszFilePath);
-            if(RT_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
                 rc = setError(VBOX_E_FILE_ERROR,
                               tr("Cannot delete file '%s' (%Rrc)"), pszFilePath, vrc);
@@ -1681 +1681 @@
     {
         vrc = RTDirRemove(pszTmpDir);
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             rc = setError(VBOX_E_FILE_ERROR,
                           tr("Cannot delete temporary directory '%s' (%Rrc)"), pszTmpDir, vrc);

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -759 +759 @@
         /* Next we have to download the OVF */
         vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
                            tr("Cannot create S3 service handler"));
@@ -769 +769 @@
         if (RT_FAILURE(vrc))
         {
-            if(vrc == VERR_S3_CANCELED)
+            if (vrc == VERR_S3_CANCELED)
                 throw S_OK; /* todo: !!!!!!!!!!!!! */
-            else if(vrc == VERR_S3_ACCESS_DENIED)
+            else if (vrc == VERR_S3_ACCESS_DENIED)
                 throw setError(E_ACCESSDENIED,
                                tr("Cannot download file '%s' from S3 storage server (Access denied). Make sure that your credentials are right. Also check that your host clock is properly synced"), pszFilename);
-            else if(vrc == VERR_S3_NOT_FOUND)
+            else if (vrc == VERR_S3_NOT_FOUND)
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Cannot download file '%s' from S3 storage server (File not found)"), pszFilename);
@@ -817 +817 @@
     {
         vrc = RTFileDelete(strTmpOvf.c_str());
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             rc = setError(VBOX_E_FILE_ERROR,
                           tr("Cannot delete file '%s' (%Rrc)"), strTmpOvf.c_str(), vrc);
@@ -825 +825 @@
     {
         vrc = RTDirRemove(pszTmpDir);
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             rc = setError(VBOX_E_FILE_ERROR,
                           tr("Cannot delete temporary directory '%s' (%Rrc)"), pszTmpDir, vrc);
@@ -1845 +1845 @@
         /* Next we have to download the disk images */
         vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
                            tr("Cannot create S3 service handler"));
@@ -1864 +1864 @@
             if (RT_FAILURE(vrc))
             {
-                if(vrc == VERR_S3_CANCELED)
+                if (vrc == VERR_S3_CANCELED)
                     throw S_OK; /* todo: !!!!!!!!!!!!! */
-                else if(vrc == VERR_S3_ACCESS_DENIED)
+                else if (vrc == VERR_S3_ACCESS_DENIED)
                     throw setError(E_ACCESSDENIED,
                                    tr("Cannot download file '%s' from S3 storage server (Access denied). Make sure that your credentials are right. Also check that your host clock is properly synced"), pszFilename);
-                else if(vrc == VERR_S3_NOT_FOUND)
+                else if (vrc == VERR_S3_NOT_FOUND)
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Cannot download file '%s' from S3 storage server (File not found)"), pszFilename);
@@ -1893 +1893 @@
         else if (RT_FAILURE(vrc))
         {
-            if(vrc == VERR_S3_CANCELED)
+            if (vrc == VERR_S3_CANCELED)
                 throw S_OK; /* todo: !!!!!!!!!!!!! */
-            else if(vrc == VERR_S3_NOT_FOUND)
+            else if (vrc == VERR_S3_NOT_FOUND)
                 vrc = VINF_SUCCESS; /* Not found is ok */
-            else if(vrc == VERR_S3_ACCESS_DENIED)
+            else if (vrc == VERR_S3_ACCESS_DENIED)
                 throw setError(E_ACCESSDENIED,
                                tr("Cannot download file '%s' from S3 storage server (Access denied). Make sure that your credentials are right. Also check that your host clock is properly synced"), pszFilename);
@@ -1942 +1942 @@
         {
             vrc = RTFileDelete(pszFilePath);
-            if(RT_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
                 rc = setError(VBOX_E_FILE_ERROR,
                               tr("Cannot delete file '%s' (%Rrc)"), pszFilePath, vrc);
@@ -1951 +1951 @@
     {
         vrc = RTDirRemove(pszTmpDir);
-        if(RT_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
             rc = setError(VBOX_E_FILE_ERROR,
                           tr("Cannot delete temporary directory '%s' (%Rrc)"), pszTmpDir, vrc);

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -3214 +3214 @@
     unsigned id = (unsigned)pCommand->iDisplay;
     int rc = VINF_SUCCESS;
-    if(id < mcMonitors)
+    if (id < mcMonitors)
     {
         IFramebuffer *pFramebuffer = maFramebuffers[id].pFramebuffer;
@@ -3224 +3224 @@
 
             HRESULT hr = pFramebuffer->ProcessVHWACommand((BYTE*)pCommand);
-            if(FAILED(hr))
+            if (FAILED(hr))
             {
                 rc = (hr == E_NOTIMPL) ? VERR_NOT_IMPLEMENTED : VERR_GENERAL_FAILURE;
@@ -3241 +3241 @@
     }
 
-    if(RT_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         /* tell the guest the command is complete */

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -300 +300 @@
             throw setError(VBOX_E_FILE_ERROR, tr ("Can't open directory '%s' (%Rrc)"), pszPath, vrc);
 
-        if(aTask->progress)
+        if (aTask->progress)
             aTask->progress->SetCurrentOperationProgress(33);
         RTDIRENTRY entry;
@@ -314 +314 @@
             }
         }
-        if(aTask->progress)
+        if (aTask->progress)
             aTask->progress->SetCurrentOperationProgress(66);
     }
@@ -328 +328 @@
         RTDirClose(pDir);
 
-    if(aTask->progress)
+    if (aTask->progress)
         aTask->progress->SetCurrentOperationProgress(99);
 
@@ -373 +373 @@
             if (RT_FAILURE(vrc))
                 throw setError(VBOX_E_FILE_ERROR, tr ("Can't delete file '%s' (%Rrc)"), szPath, vrc);
-            if(aTask->progress)
+            if (aTask->progress)
                 aTask->progress->SetCurrentOperationProgress((ULONG)(fPercentStep * i));
         }
@@ -499 +499 @@
             if (RT_FAILURE(vrc))
                 throw setError(VBOX_E_FILE_ERROR, tr ("Can't delete file '%s' (%Rrc)"), (*it).c_str(), vrc);
-            if(aTask->progress)
+            if (aTask->progress)
                 aTask->progress->SetCurrentOperationProgress((ULONG)(fPercentStep * i));
         }

trunk/src/VBox/Main/darwin/HostPowerDarwin.cpp

@@ -179 +179 @@
     if (CFArrayGetCount (pSources) > 0)
     {
-        for(int i = 0; i < CFArrayGetCount (pSources); ++i)
+        for (int i = 0; i < CFArrayGetCount (pSources); ++i)
         {
             pSource = IOPSGetPowerSourceDescription (pBlob, CFArrayGetValueAtIndex (pSources, i));
             /* If the source is empty skip over to the next one. */
-            if(!pSource)
+            if (!pSource)
                 continue;
             /* Skip all power sources which are currently not present like a