Changeset 80585 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Sep 4, 2019 2:05:50 PM (5 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/Runtime/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstFile.cpp (modified) (3 diffs)
• tstRTDvm.cpp (modified) (1 diff)
• tstRTFileQuerySize-1.cpp (moved) (moved from trunk/src/VBox/Runtime/testcase/tstRTFileGetSize-1.cpp ) (3 diffs)
• tstRTFilesystem.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -67 +67 @@
         tstRTFileAio \
         tstRTFileAppend-1 \
-        tstRTFileGetSize-1 \
+        tstRTFileQuerySize-1 \
         tstRTFileModeStringToFlags \
         tstFileLock \
@@ -362 +362 @@
 tstRTFileAppend-1_SOURCES = tstRTFileAppend-1.cpp
 
-tstRTFileGetSize-1_TEMPLATE = VBOXR3TSTEXE
-tstRTFileGetSize-1_SOURCES = tstRTFileGetSize-1.cpp
+tstRTFileQuerySize-1_TEMPLATE = VBOXR3TSTEXE
+tstRTFileQuerySize-1_SOURCES = tstRTFileQuerySize-1.cpp
 
 tstRTFileModeStringToFlags_TEMPLATE = VBOXR3TSTEXE

trunk/src/VBox/Runtime/testcase/tstFile.cpp

@@ -51 +51 @@
 
     RTFOFF cbMax = -2;
-    rc = RTFileGetMaxSizeEx(File, &cbMax);
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("tstFile: RTFileGetMaxSizeEx failed: %Rrc\n", rc);
+    rc = RTFileQueryMaxSizeEx(File, &cbMax);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("tstFile: RTFileQueryMaxSizeEx failed: %Rrc\n", rc);
         cErrors++;
     }
     else if (cbMax <= 0)
     {
-        RTPrintf("tstFile: RTFileGetMaxSizeEx failed: cbMax=%RTfoff\n", cbMax);
+        RTPrintf("tstFile: RTFileQueryMaxSizeEx failed: cbMax=%RTfoff\n", cbMax);
         cErrors++;
     }
@@ -80 +80 @@
     {
         uint64_t cb;
-        rc = RTFileGetSize(File, &cb);
+        rc = RTFileQuerySize(File, &cb);
         if (RT_FAILURE(rc))
         {
@@ -88 +88 @@
         else if (cb != _2G + _1M)
         {
-            RTPrintf("RTFileGetSize return %RX64 bytes, expected %RX64.\n", cb, _2G + _1M);
+            RTPrintf("RTFileQuerySize return %RX64 bytes, expected %RX64.\n", cb, _2G + _1M);
             cErrors++;
         }

trunk/src/VBox/Runtime/testcase/tstRTDvm.cpp

@@ -190 +190 @@
 
     uint64_t cb = 0;
-    rc = RTVfsFileGetSize(hVfsDisk, &cb);
+    rc = RTVfsFileQuerySize(hVfsDisk, &cb);
     if (   RT_FAILURE(rc)
         || cb % 512 != 0) /* Assume 512 byte sector size. */
     {
-        RTTestIFailed("RTVfsFileGetSize -> %Rrc", rc);
+        RTTestIFailed("RTVfsFileQuerySize -> %Rrc", rc);
         return RTTestSummaryAndDestroy(hTest);
     }

trunk/src/VBox/Runtime/testcase/tstRTFileQuerySize-1.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT Testcase - RTFileGetSize.
+ * IPRT Testcase - RTFileQuerySize.
  */
 
@@ -58 +58 @@
 
     uint64_t    cbFile = UINT64_MAX - 42;
-    RTTESTI_CHECK_RC(rc = RTFileGetSize(hFile, &cbFile), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(rc = RTFileQuerySize(hFile, &cbFile), VINF_SUCCESS);
     if (RT_SUCCESS(rc))
     {
@@ -73 +73 @@
 {
     RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstRTFileGetSize-1", &hTest);
+    int rc = RTTestInitAndCreate("tstRTFileQuerySize-1", &hTest);
     if (rc)
         return rc;

trunk/src/VBox/Runtime/testcase/tstRTFilesystem.cpp

@@ -60 +60 @@
     uint64_t cbFs = 0;
 
-    rc = RTVfsFileGetSize(hVfsFile, &cbFs);
+    rc = RTVfsFileQuerySize(hVfsFile, &cbFs);
     if (RT_FAILURE(rc))
     {
-        RTTestIFailed("RTVfsFileGetSize -> %Rrc", rc);
+        RTTestIFailed("RTVfsFileQuerySize -> %Rrc", rc);
         return rc;
     }