Changeset 98100 in vbox

Timestamp:

Jan 17, 2023 10:56:32 AM (23 months ago)

Author:

vboxsync

Message:

Main: Nits.

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (4 diffs)
• src-server/MediumLock.cpp (modified) (2 diffs)

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

@@ -5084 +5084 @@
                 if (fHotplug)
                 {
-                    USBStorageDevice UsbMsd = USBStorageDevice();
+                    USBStorageDevice UsbMsd;
                     RTUuidCreate(&UsbMsd.mUuid);
                     UsbMsd.iPort = uInstance;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -3873 +3873 @@
 
     bool fSilent = false;
-    Utf8Str strReconfig;
 
     /* Check whether the flag to allow silent storage attachment reconfiguration is set. */
-    strReconfig = i_getExtraData(Utf8Str("VBoxInternal2/SilentReconfigureWhilePaused"));
+    Utf8Str const strReconfig = i_getExtraData(Utf8Str("VBoxInternal2/SilentReconfigureWhilePaused"));
     if (   mData->mMachineState == MachineState_Paused
         && strReconfig == "1")
@@ -3900 +3899 @@
 
     /* check if the device slot is already busy */
-    MediumAttachment *pAttachTemp;
-    if ((pAttachTemp = i_findAttachment(*mMediumAttachments.data(),
-                                        aName,
-                                        aControllerPort,
-                                        aDevice)))
+    MediumAttachment *pAttachTemp = i_findAttachment(*mMediumAttachments.data(),
+                                                     aName,
+                                                     aControllerPort,
+                                                     aDevice);
+    if (pAttachTemp)
     {
         Medium *pMedium = pAttachTemp->i_getMedium();
@@ -3932 +3931 @@
     AutoWriteLock mediumLock(medium COMMA_LOCKVAL_SRC_POS);
 
-    if (    (pAttachTemp = i_findAttachment(*mMediumAttachments.data(), medium))
+    pAttachTemp = i_findAttachment(*mMediumAttachments.data(), medium);
+    if (    pAttachTemp
          && !medium.isNull()
          && (   medium->i_getType() != MediumType_Readonly
@@ -3986 +3986 @@
              * changing attachments in which case the attachment just needs to
              * be restored */
-            if ((pAttachTemp = i_findAttachment(oldAtts, medium)))
+            pAttachTemp = i_findAttachment(oldAtts, medium);
+            if (pAttachTemp)
             {
                 AssertReturn(!fIndirect, E_FAIL);

trunk/src/VBox/Main/src-server/MediumLock.cpp

@@ -298 +298 @@
 
 HRESULT MediumLockListMap::Insert(const ComObjPtr<MediumAttachment> &aMediumAttachment,
-                              MediumLockList *aMediumLockList)
+                                  MediumLockList *aMediumLockList)
 {
     if (mIsLocked)
@@ -307 +307 @@
 
 HRESULT MediumLockListMap::ReplaceKey(const ComObjPtr<MediumAttachment> &aMediumAttachmentOld,
-                                  const ComObjPtr<MediumAttachment> &aMediumAttachmentNew)
+                                      const ComObjPtr<MediumAttachment> &aMediumAttachmentNew)
 {
     MediumLockListMap::Base::iterator it = mMediumLocks.find(aMediumAttachmentOld);