Changeset 80585 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 4, 2019 2:05:50 PM (6 years ago)

Author:

vboxsync

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

133105

Message:

Runtime: Some renaming to stay consistent (*Get* always returns what is asked for while *Query* returns a status code and where to store the value on success is given as a pointer)

• RTVfsFileGetSize -> RTVfsFileQuerySize
• RTFileQuerySize -> RTFileQuerySizeByPath
• RTFileGetSize -> RTFileQuerySize
• RTFileGetSizeMaxEx -> RTFileQuerySizeMaxEx

Location:

trunk/src/VBox/Main

Files:

• src-all/TextScript.cpp (modified) (2 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-client/GuestSessionImplTasks.cpp (modified) (1 diff)
• src-server/MachineImplCloneVM.cpp (modified) (1 diff)
• src-server/MachineImplMoveVM.cpp (modified) (4 diffs)
• src-server/MediumImpl.cpp (modified) (1 diff)
• src-server/generic/AutostartDb-generic.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-all/TextScript.cpp

@@ -65 +65 @@
     HRESULT  hrc;
     uint64_t cbFile = 0;
-    int vrc = RTVfsFileGetSize(hVfsFile, &cbFile);
+    int vrc = RTVfsFileQuerySize(hVfsFile, &cbFile);
     if (   RT_SUCCESS(vrc)
         && cbFile < _16M)
@@ -108 +108 @@
                                       mpSetError->tr("'%s' is too big (max 16MB): %'RU64"), pszFilename, cbFile);
     else
-        hrc = mpSetError->setErrorVrc(vrc, mpSetError->tr("RTVfsFileGetSize failed (%Rrc)"), vrc);
+        hrc = mpSetError->setErrorVrc(vrc, mpSetError->tr("RTVfsFileQuerySize failed (%Rrc)"), vrc);
     return hrc;
 }

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

@@ -3969 +3969 @@
                 RTFOFF maxSize;
                 /* Careful: This function will work only on selected local file systems! */
-                rc = RTFileGetMaxSizeEx(file, &maxSize);
+                rc = RTFileQueryMaxSizeEx(file, &maxSize);
                 RTFileClose(file);
                 if (   RT_SUCCESS(rc)

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

@@ -1979 +1979 @@
     {
         uint64_t cbSrcSize = 0;
-        rc = RTVfsFileGetSize(hVfsFile, &cbSrcSize);
+        rc = RTVfsFileQuerySize(hVfsFile, &cbSrcSize);
         if (RT_SUCCESS(rc))
         {

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

@@ -222 +222 @@
         sst.strSaveStateFile = bstrSrcSaveStatePath;
         uint64_t cbSize;
-        int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &cbSize);
+        int vrc = RTFileQuerySizeByPath(sst.strSaveStateFile.c_str(), &cbSize);
         if (RT_FAILURE(vrc))
             return p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, p->tr("Could not query file size of '%s' (%Rrc)"),

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

@@ -393 +393 @@
             if (name.contains(strSettingsFilePath))
             {
-                vrc = RTFileQuerySize(name.c_str(), &cbFile);
+                vrc = RTFileQuerySizeByPath(name.c_str(), &cbFile);
                 if (RT_SUCCESS(vrc))
                 {
@@ -448 +448 @@
 
                     uint64_t cbFile = 0;
-                    vrc = RTFileQuerySize(strFile.c_str(), &cbFile);
+                    vrc = RTFileQuerySizeByPath(strFile.c_str(), &cbFile);
                     if (RT_SUCCESS(vrc))
                     {
@@ -1297 +1297 @@
                 Utf8Str fullPath =  it->first;
                 fullPath.append(RTPATH_DELIMITER).append(it->second);
-                vrc = RTFileQuerySize(fullPath.c_str(), &cbFile);
+                vrc = RTFileQuerySizeByPath(fullPath.c_str(), &cbFile);
                 if (RT_SUCCESS(vrc))
                 {
@@ -1482 +1482 @@
         uint64_t cbSize;
 
-        int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &cbSize);
+        int vrc = RTFileQuerySizeByPath(sst.strSaveStateFile.c_str(), &cbSize);
         if (RT_FAILURE(vrc))
             return m_pMachine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc,

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

@@ -5547 +5547 @@
         if (i_isMediumFormatFile() && pOther->i_isMediumFormatFile())
         {
-            vrc = RTFileQuerySize(this->i_getLocationFull().c_str(), &cbMediumThis);
+            vrc = RTFileQuerySizeByPath(this->i_getLocationFull().c_str(), &cbMediumThis);
             if (RT_SUCCESS(vrc))
             {
-                vrc = RTFileQuerySize(pOther->i_getLocationFull().c_str(),
+                vrc = RTFileQuerySizeByPath(pOther->i_getLocationFull().c_str(),
                                       &cbMediumOther);
             }

trunk/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp

@@ -72 +72 @@
                  * should be really really small. Anything else is bogus.
                  */
-                rc = RTFileGetSize(hAutostartFile, &cbFile);
+                rc = RTFileQuerySize(hAutostartFile, &cbFile);
                 if (   RT_SUCCESS(rc)
                     && cbFile <= 16)