Changeset 56450 in vbox for trunk/src

Timestamp:

Jun 16, 2015 1:21:07 PM (10 years ago)

Author:

vboxsync

Message:

Main: Style

Location:

trunk/src/VBox/Main

Files:

• include/SessionImpl.h (modified) (1 diff)
• src-client/SessionImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/SessionImpl.h

@@ -141 +141 @@
 
 
-    HRESULT i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock *pLockW);
+    HRESULT i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock &aLockW);
 
     SessionState_T mState;

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -123 +123 @@
                mState == SessionState_Spawning);
 
-        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */, &alock);
+        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */, alock);
         AssertComRC(rc);
     }
@@ -240 +240 @@
 
     CHECK_OPEN();
-    return i_unlockMachine(false /* aFinalRelease */, false /* aFromServer */, &alock);
+    return i_unlockMachine(false /* aFinalRelease */, false /* aFromServer */, alock);
 }
 
@@ -534 +534 @@
 
         /* close ourselves */
-        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */, &alock);
+        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */, alock);
     }
     else if (getObjectState().getState() == ObjectState::InUninit)
@@ -1063 +1063 @@
  *  @note To be called only from #uninit(), #UnlockMachine() or #Uninitialize().
  */
-HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock *pLockW)
+HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock &aLockW)
 {
     LogFlowThisFuncEnter();
@@ -1071 +1071 @@
     LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
 
-    Assert(pLockW->isWriteLockOnCurrentThread());
+    Assert(aLockW.isWriteLockOnCurrentThread());
 
     if (mState != SessionState_Locked)
@@ -1138 +1138 @@
          *  SessionState_Closing here, so it's safe.
          */
-        pLockW->release();
-
-        Assert(!pLockW->isWriteLockOnCurrentThread());
+        aLockW.release();
+
+        Assert(!aLockW.isWriteLockOnCurrentThread());
 
         LogFlowThisFunc(("Calling mControl->OnSessionEnd()...\n"));
@@ -1146 +1146 @@
         LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", rc));
 
-        pLockW->acquire();
+        aLockW.acquire();
 
         /*