Changeset 21878 in vbox for trunk/src/VBox/Main/SharedFolderImpl.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/SharedFolderImpl.cpp (modified) (16 diffs)

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -70 +70 @@
 {
     /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan (this);
-    AssertReturn (autoInitSpan.isOk(), E_FAIL);
-
-    unconst (mMachine) = aMachine;
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    unconst(mMachine) = aMachine;
 
     HRESULT rc = protectedInit (aMachine, aName, aHostPath, aWritable);
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED (rc))
+    if (SUCCEEDED(rc))
         autoInitSpan.setSucceeded();
 
@@ -99 +99 @@
 
     /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan (this);
-    AssertReturn (autoInitSpan.isOk(), E_FAIL);
-
-    unconst (mMachine) = aMachine;
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    unconst(mMachine) = aMachine;
 
     HRESULT rc = protectedInit (aMachine, aThat->m.name,
@@ -108 +108 @@
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED (rc))
+    if (SUCCEEDED(rc))
         autoInitSpan.setSucceeded();
 
@@ -128 +128 @@
 {
     /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan (this);
-    AssertReturn (autoInitSpan.isOk(), E_FAIL);
-
-    unconst (mConsole) = aConsole;
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    unconst(mConsole) = aConsole;
 
     HRESULT rc = protectedInit (aConsole, aName, aHostPath, aWritable);
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED (rc))
+    if (SUCCEEDED(rc))
         autoInitSpan.setSucceeded();
 
@@ -156 +156 @@
 {
     /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan (this);
-    AssertReturn (autoInitSpan.isOk(), E_FAIL);
-
-    unconst (mVirtualBox) = aVirtualBox;
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    unconst(mVirtualBox) = aVirtualBox;
 
     HRESULT rc = protectedInit (aVirtualBox, aName, aHostPath, aWritable);
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED (rc))
+    if (SUCCEEDED(rc))
         autoInitSpan.setSucceeded();
 
@@ -179 +179 @@
                                      CBSTR aName, CBSTR aHostPath, BOOL aWritable)
 {
-    LogFlowThisFunc (("aName={%ls}, aHostPath={%ls}, aWritable={%d}\n",
+    LogFlowThisFunc(("aName={%ls}, aHostPath={%ls}, aWritable={%d}\n",
                       aName, aHostPath, aWritable));
 
@@ -209 +209 @@
     int vrc = RTPathAbsEx (NULL, hostPath,
                            hostPathFull, sizeof (hostPathFull));
-    if (RT_FAILURE (vrc))
+    if (RT_FAILURE(vrc))
         return setError (E_INVALIDARG,
             tr ("Invalid shared folder path: '%s' (%Rrc)"), hostPath.raw(), vrc);
@@ -217 +217 @@
             tr ("Shared folder path '%s' is not absolute"), hostPath.raw());
 
-    unconst (mParent) = aParent;
+    unconst(mParent) = aParent;
 
     /* register with parent */
     mParent->addDependentChild (this);
 
-    unconst (m.name) = aName;
-    unconst (m.hostPath) = hostPath;
+    unconst(m.name) = aName;
+    unconst(m.hostPath) = hostPath;
     m.writable = aWritable;
 
@@ -235 +235 @@
 void SharedFolder::uninit()
 {
-    LogFlowThisFunc (("\n"));
+    LogFlowThisFunc(("\n"));
 
     /* Enclose the state transition Ready->InUninit->NotReady */
-    AutoUninitSpan autoUninitSpan (this);
+    AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
         return;
@@ -245 +245 @@
         mParent->removeDependentChild (this);
 
-    unconst (mParent) = NULL;
-
-    unconst (mMachine).setNull();
-    unconst (mConsole).setNull();
-    unconst (mVirtualBox).setNull();
+    unconst(mParent) = NULL;
+
+    unconst(mMachine).setNull();
+    unconst(mConsole).setNull();
+    unconst(mVirtualBox).setNull();
 }
 
@@ -259 +259 @@
     CheckComArgOutPointerValid(aName);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
 
     /* mName is constant during life time, no need to lock */
-    m.name.cloneTo (aName);
+    m.name.cloneTo(aName);
 
     return S_OK;
@@ -272 +272 @@
     CheckComArgOutPointerValid(aHostPath);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
 
     /* mHostPath is constant during life time, no need to lock */
-    m.hostPath.cloneTo (aHostPath);
+    m.hostPath.cloneTo(aHostPath);
 
     return S_OK;
@@ -283 +283 @@
 STDMETHODIMP SharedFolder::COMGETTER(Accessible) (BOOL *aAccessible)
 {
-    CheckComArgOutPointerValid (aAccessible);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    CheckComArgOutPointerValid(aAccessible);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
 
     /* mName and mHostPath are constant during life time, no need to lock */
@@ -296 +296 @@
                                                     sizeof (hostPathFull))
                                       : VERR_PATH_NOT_FOUND;
-    if (RT_SUCCESS (vrc))
+    if (RT_SUCCESS(vrc))
     {
         *aAccessible = TRUE;
@@ -302 +302 @@
     }
 
-    AutoWriteLock alock (this);
+    AutoWriteLock alock(this);
 
     m.lastAccessError = BstrFmt (
         tr ("'%s' is not accessible (%Rrc)"), hostPath.raw(), vrc);
 
-    LogWarningThisFunc (("m.lastAccessError=\"%ls\"\n", m.lastAccessError.raw()));
+    LogWarningThisFunc(("m.lastAccessError=\"%ls\"\n", m.lastAccessError.raw()));
 
     *aAccessible = FALSE;
@@ -324 +324 @@
 STDMETHODIMP SharedFolder::COMGETTER(LastAccessError) (BSTR *aLastAccessError)
 {
-    CheckComArgOutPointerValid (aLastAccessError);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoReadLock alock (this);
+    CheckComArgOutPointerValid(aLastAccessError);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
 
     if (m.lastAccessError.isEmpty())
         Bstr("").cloneTo(aLastAccessError);
     else
-        m.lastAccessError.cloneTo (aLastAccessError);
+        m.lastAccessError.cloneTo(aLastAccessError);
 
     return S_OK;