Changeset 72950 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 7, 2018 4:31:24 PM (7 years ago)

Author:

vboxsync

Message:

MediumIOImpl.cpp: Fix gcc warnings and errors.

File:

• trunk/src/VBox/Main/src-server/MediumIOImpl.cpp (modified) (8 diffs)

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

@@ -31 +31 @@
 #include <iprt/fsvfs.h>
 #include <iprt/dvm.h>
+#include <iprt/cpp/utils.h>
 
 
@@ -41 +42 @@
 struct MediumIO::Data
 {
-    Data(Medium * const a_pMedium = NULL, bool a_fWritable = false, uint32_t a_cbSector = 512)
+    Data(Medium * const a_pMedium, bool a_fWritable, uint32_t a_cbSector = 512)
         : ptrMedium(a_pMedium)
         , fWritable(a_fWritable)
         , cbSector(a_cbSector)
-        , SecretKeyStore(false /*fKeyBufNonPageable*/)
+        , PasswordStore(false /*fKeyBufNonPageable*/)
         , pHdd(NULL)
         , hVfsFile(NIL_RTVFSFILE)
@@ -58 +59 @@
     uint32_t                        cbSector;
     /** Secret key store used to hold the passwords for encrypted medium. */
-    SecretKeyStore                  SecretKeyStore;
+    SecretKeyStore                  PasswordStore;
     /** Crypto filter settings. */
     MediumCryptoFilterSettings      CryptoSettings;
@@ -67 +68 @@
     /** VFS file for the HDD instance. */
     RTVFSFILE                       hVfsFile;
+
+private:
+    Data() : PasswordStore(false) { }
 };
 
@@ -129 +133 @@
         if (rStrKeyId.isNotEmpty())
         {
-            int vrc = m->SecretKeyStore.addSecretKey(rStrKeyId, (const uint8_t *)rStrPassword.c_str(),
-                                                     rStrPassword.length() + 1 /*including the Schwarzenegger character*/);
+            int vrc = m->PasswordStore.addSecretKey(rStrKeyId, (const uint8_t *)rStrPassword.c_str(),
+                                                    rStrPassword.length() + 1 /*including the Schwarzenegger character*/);
             if (vrc == VERR_NO_MEMORY)
                 hrc = setError(E_OUTOFMEMORY, tr("Failed to allocate enough secure memory for the key/password"));
@@ -142 +146 @@
         if (SUCCEEDED(hrc))
         {
-            hrc = pMedium->i_openHddForIO(fWritable, &m->SecretKeyStore, &m->pHdd, &m->LockList, &m->CryptoSettings);
+            hrc = pMedium->i_openHddForIO(fWritable, &m->PasswordStore, &m->pHdd, &m->LockList, &m->CryptoSettings);
             if (SUCCEEDED(hrc))
             {
@@ -326 +330 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     RTERRINFOSTATIC ErrInfo;
-    int vrc = RTFsFatVolFormat(m->hVfsFile, 0, 0, a_fQuick ? RTFSFATVOL_FMT_F_QUICK : RTFSFATVOL_FMT_F_FULL, m->cbSector, 0,
-                               RTFSFATTYPE_INVALID, 0, 0, 0, 0, 0, RTErrInfoInitStatic(&ErrInfo));
+    int vrc = RTFsFatVolFormat(m->hVfsFile, 0, 0, a_fQuick ? RTFSFATVOL_FMT_F_QUICK : RTFSFATVOL_FMT_F_FULL,
+                               (uint16_t)m->cbSector, 0, RTFSFATTYPE_INVALID, 0, 0, 0, 0, 0, RTErrInfoInitStatic(&ErrInfo));
     alock.release();
 
@@ -430 +434 @@
     m->LockList.Clear();
     m->ptrMedium.setNull();
-    m->SecretKeyStore.deleteAllSecretKeys(false /* fSuspend */, true /* fForce */);
-}
-
+    m->PasswordStore.deleteAllSecretKeys(false /* fSuspend */, true /* fForce */);
+}
+