Changeset 26186 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Feb 3, 2010 1:07:12 PM (15 years ago)

Author:

vboxsync

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

57205

Message:

Main: coding style fixes

Location:

trunk/src/VBox/Main/glue

Files:

• ErrorInfo.cpp (modified) (3 diffs)
• EventQueue.cpp (modified) (3 diffs)
• SupportErrorInfo.cpp (modified) (19 diffs)
• initterm.cpp (modified) (2 diffs)
• string.cpp (modified) (4 diffs)

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -145 +145 @@
 void ErrorInfo::init (IUnknown *aI, const GUID &aIID, bool aKeepObj /* = false */)
 {
-    Assert (aI);
+    Assert(aI);
     if (!aI)
         return;
@@ -210 +210 @@
     {
         mNext.reset (new ErrorInfo (next));
-        Assert (mNext.get());
+        Assert(mNext.get());
         if (!mNext.get())
             rc = E_OUTOFMEMORY;
@@ -235 +235 @@
     ErrorInfo (false /* aDummy */)
 {
-    Assert (progress);
+    Assert(progress);
     if (!progress)
         return;

trunk/src/VBox/Main/glue/EventQueue.cpp

@@ -485 +485 @@
 BOOL EventQueue::waitForEvent (Event **event)
 {
-    Assert (event);
+    Assert(event);
     if (!event)
         return FALSE;
@@ -518 +518 @@
         rc = mEventQ->WaitForEvent (&ev);
         // check for error
-        if (FAILED (rc))
+        if (FAILED(rc))
             return FALSE;
         // check for EINTR signal
@@ -545 +545 @@
 BOOL EventQueue::handleEvent (Event *event)
 {
-    Assert (event);
+    Assert(event);
     if (!event)
         return FALSE;

trunk/src/VBox/Main/glue/SupportErrorInfo.cpp

@@ -50 +50 @@
     {
         sCounter = RTTlsAlloc();
-        AssertReturnVoid (sCounter != NIL_RTTLS);
+        AssertReturnVoid(sCounter != NIL_RTTLS);
     }
 
-    uintptr_t counter = (uintptr_t) RTTlsGet (sCounter);
-    ++ counter;
-    RTTlsSet (sCounter, (void *) counter);
+    uintptr_t counter = (uintptr_t)RTTlsGet(sCounter);
+    ++counter;
+    RTTlsSet(sCounter, (void*)counter);
 }
 
@@ -61 +61 @@
 void MultiResult::decCounter()
 {
-    uintptr_t counter = (uintptr_t) RTTlsGet (sCounter);
-    AssertReturnVoid (counter != 0);
-    -- counter;
-    RTTlsSet (sCounter, (void *) counter);
+    uintptr_t counter = (uintptr_t)RTTlsGet(sCounter);
+    AssertReturnVoid(counter != 0);
+    --counter;
+    RTTlsSet(sCounter, (void*)counter);
 }
 
@@ -106 +106 @@
 {
     /* whether multi-error mode is turned on */
-    bool preserve = ((uintptr_t) RTTlsGet (MultiResult::sCounter)) > 0;
+    bool preserve = ((uintptr_t)RTTlsGet(MultiResult::sCounter)) > 0;
 
     LogRel(("ERROR [COM]: aRC=%#08x aIID={%RTuuid} aComponent={%s} aText={%s} aWarning=%RTbool, aInfo=%p, preserve=%RTbool\n",
@@ -120 +120 @@
     {
         /* these are mandatory, others -- not */
-        AssertReturn((!aWarning && FAILED (aResultCode)) ||
+        AssertReturn((!aWarning && FAILED(aResultCode)) ||
                       (aWarning && aResultCode != S_OK),
                       E_FAIL);
@@ -143 +143 @@
             /* get the current error info if any */
             ComPtr<IErrorInfo> err;
-            rc = ::GetErrorInfo (0, err.asOutParam());
+            rc = ::GetErrorInfo(0, err.asOutParam());
             if (FAILED(rc)) break;
             rc = err.queryInterfaceTo(curInfo.asOutParam());
-            if (FAILED (rc))
+            if (FAILED(rc))
             {
                 /* create a IVirtualBoxErrorInfo wrapper for the native
@@ -154 +154 @@
                 if (SUCCEEDED(rc))
                 {
-                    rc = wrapper->init (err);
+                    rc = wrapper->init(err);
                     if (SUCCEEDED(rc))
                         curInfo = wrapper;
@@ -176 +176 @@
                 if (FAILED(rc)) break;
 
-                rc = infoObj->init (aInfo, curInfo);
+                rc = infoObj->init(aInfo, curInfo);
                 if (FAILED(rc)) break;
 
@@ -183 +183 @@
 
             /* we want to return the head's result code */
-            rc = info->COMGETTER(ResultCode) (&aResultCode);
+            rc = info->COMGETTER(ResultCode)(&aResultCode);
             if (FAILED(rc)) break;
         }
@@ -192 +192 @@
             if (FAILED(rc)) break;
 
-            rc = infoObj->init (aResultCode, aIID, aComponent, strText.c_str(), curInfo);
+            rc = infoObj->init(aResultCode, aIID, aComponent, strText.c_str(), curInfo);
             if (FAILED(rc)) break;
 
@@ -201 +201 @@
         rc = info.queryInterfaceTo(err.asOutParam());
         if (SUCCEEDED(rc))
-            rc = ::SetErrorInfo (0, err);
+            rc = ::SetErrorInfo(0, err);
 
 #else // !defined (VBOX_WITH_XPCOM)
 
         nsCOMPtr <nsIExceptionService> es;
-        es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
+        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
         if (NS_SUCCEEDED(rc))
         {
             nsCOMPtr <nsIExceptionManager> em;
-            rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
+            rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
             if (FAILED(rc)) break;
 
@@ -218 +218 @@
                 /* get the current error info if any */
                 ComPtr<nsIException> ex;
-                rc = em->GetCurrentException (ex.asOutParam());
+                rc = em->GetCurrentException(ex.asOutParam());
                 if (FAILED(rc)) break;
                 rc = ex.queryInterfaceTo(curInfo.asOutParam());
-                if (FAILED (rc))
+                if (FAILED(rc))
                 {
                     /* create a IVirtualBoxErrorInfo wrapper for the native
@@ -229 +229 @@
                     if (SUCCEEDED(rc))
                     {
-                        rc = wrapper->init (ex);
+                        rc = wrapper->init(ex);
                         if (SUCCEEDED(rc))
                             curInfo = wrapper;
@@ -236 +236 @@
             }
             /* On failure, curInfo will stay null */
-            Assert (SUCCEEDED(rc) || curInfo.isNull());
+            Assert(SUCCEEDED(rc) || curInfo.isNull());
 
             /* set the current error info and preserve the previous one if any */
@@ -251 +251 @@
                     if (FAILED(rc)) break;
 
-                    rc = infoObj->init (aInfo, curInfo);
+                    rc = infoObj->init(aInfo, curInfo);
                     if (FAILED(rc)) break;
 
@@ -259 +259 @@
                 /* we want to return the head's result code */
                 PRInt32 lrc;
-                rc = info->COMGETTER(ResultCode) (&lrc); aResultCode = lrc;
+                rc = info->COMGETTER(ResultCode)(&lrc); aResultCode = lrc;
                 if (FAILED(rc)) break;
             }
@@ -277 +277 @@
             rc = info.queryInterfaceTo(ex.asOutParam());
             if (SUCCEEDED(rc))
-                rc = em->SetCurrentException (ex);
+                rc = em->SetCurrentException(ex);
         }
         else if (rc == NS_ERROR_UNEXPECTED)
@@ -301 +301 @@
     while (0);
 
-    AssertComRC (rc);
+    AssertComRC(rc);
 
     return SUCCEEDED(rc) ? aResultCode : rc;
@@ -307 +307 @@
 
 /* static */
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const GUID &aIID,
-                                        const char *aComponent, const char *aText,
-                                        ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setErrorV (aResultCode, aIID, aComponent, aText, args);
-    va_end (args);
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const GUID &aIID,
+                                       const char *aComponent, const char *aText,
+                                       ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setErrorV(aResultCode, aIID, aComponent, aText, args);
+    va_end(args);
     return rc;
 }
 
 /* static */
-HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const GUID &aIID,
-                                          const char *aComponent, const char *aText,
-                                          ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setWarningV (aResultCode, aIID, aComponent, aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setErrorV (aResultCode, mainInterfaceID(), componentName(),
-                            aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const Utf8Str &strText)
+HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const GUID &aIID,
+                                         const char *aComponent, const char *aText,
+                                         ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setWarningV(aResultCode, aIID, aComponent, aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setErrorV(aResultCode, mainInterfaceID(), componentName(),
+                           aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const Utf8Str &strText)
 {
     HRESULT rc = setError(aResultCode,
@@ -349 +349 @@
 }
 
-HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setWarningV (aResultCode, mainInterfaceID(), componentName(),
-                              aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const GUID &aIID,
-                                        const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setErrorV (aResultCode, aIID, componentName(), aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const GUID &aIID,
-                                          const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setWarningV (aResultCode, aIID, componentName(), aText, args);
-    va_end (args);
+HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setWarningV(aResultCode, mainInterfaceID(), componentName(),
+                             aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const GUID &aIID,
+                                       const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setErrorV(aResultCode, aIID, componentName(), aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const GUID &aIID,
+                                         const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setWarningV(aResultCode, aIID, componentName(), aText, args);
+    va_end(args);
     return rc;
 }

trunk/src/VBox/Main/glue/initterm.cpp

@@ -444 +444 @@
             /* Use RTPathAppPrivateArch() first */
             vrc = RTPathAppPrivateArch(szAppHomeDir, sizeof(szAppHomeDir));
-            AssertRC (vrc);
+            AssertRC(vrc);
         }
         else
@@ -450 +450 @@
             /* Iterate over all other paths */
             szAppHomeDir[RTPATH_MAX - 1] = '\0';
-            strncpy(szAppHomeDir, kAppPathsToProbe [i], RTPATH_MAX - 1);
+            strncpy(szAppHomeDir, kAppPathsToProbe[i], RTPATH_MAX - 1);
             vrc = VINF_SUCCESS;
         }

trunk/src/VBox/Main/glue/string.cpp

@@ -77 +77 @@
 };
 
-void Utf8StrFmt::init (const char *format, va_list args)
+void Utf8StrFmt::init(const char *format, va_list args)
 {
     if (!format)
@@ -83 +83 @@
 
     // assume an extra byte for a terminating zero
-    size_t fmtlen = strlen (format) + 1;
+    size_t fmtlen = strlen(format) + 1;
 
     FormatData data;
@@ -90 +90 @@
         data.size += fmtlen;
     data.pos = 0;
-    data.cache = (char *) ::RTMemTmpAllocZ (data.size);
+    data.cache = (char*)::RTMemTmpAllocZ(data.size);
 
-    size_t n = ::RTStrFormatV (strOutput, &data, NULL, NULL, format, args);
+    size_t n = ::RTStrFormatV(strOutput, &data, NULL, NULL, format, args);
 
-    AssertMsg (n == data.pos,
-               ("The number of bytes formatted doesn't match: %d and %d!",
-                n, data.pos));
-    NOREF (n);
+    AssertMsg(n == data.pos,
+              ("The number of bytes formatted doesn't match: %d and %d!", n, data.pos));
+    NOREF(n);
 
     // finalize formatting
-    data.cache [data.pos] = 0;
-    (*static_cast <Utf8Str *> (this)) = data.cache;
-    ::RTMemTmpFree (data.cache);
+    data.cache[data.pos] = 0;
+    (*static_cast<Utf8Str*>(this)) = data.cache;
+    ::RTMemTmpFree(data.cache);
 }
 
 // static
-DECLCALLBACK(size_t) Utf8StrFmt::strOutput (void *pvArg, const char *pachChars,
-                                            size_t cbChars)
+DECLCALLBACK(size_t) Utf8StrFmt::strOutput(void *pvArg, const char *pachChars,
+                                           size_t cbChars)
 {
-    Assert (pvArg);
+    Assert(pvArg);
     FormatData &data = *(FormatData *) pvArg;
 
     if (!(pachChars == NULL && cbChars == 0))
     {
-        Assert (pachChars);
+        Assert(pachChars);
 
         // append to cache (always assume an extra byte for a terminating zero)
@@ -123 +122 @@
             if (needed >= FormatData::CacheIncrement)
                 data.size += needed;
-            data.cache = (char *) ::RTMemRealloc (data.cache, data.size);
+            data.cache = (char*)::RTMemRealloc(data.cache, data.size);
         }
-        strncpy (data.cache + data.pos, pachChars, cbChars);
+        strncpy(data.cache + data.pos, pachChars, cbChars);
         data.pos += cbChars;
     }