Changeset 13835 in vbox for trunk/src/VBox/Devices/Storage/testcase

Timestamp:

Nov 5, 2008 2:34:43 AM (16 years ago)

Author:

vboxsync

Message:

s/VBOX_SUCCESS/RT_SUCCESS/g s/VBOX_FAILURE/RT_FAILURE/g - VBOX_SUCCESS and VBOX_FAILURE have *NOT* been retired (because old habbits die hard) just sligtly deprecated.

Location:

trunk/src/VBox/Devices/Storage/testcase

Files:

• tstVD-2.cpp (modified) (2 diffs)
• tstVD.cpp (modified) (36 diffs)
• tstVDI.cpp (modified) (2 diffs)
• vditool.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/Storage/testcase/tstVD-2.cpp

@@ -49 +49 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
             return rc; \
     } while (0)
@@ -155 +155 @@
 
     rc = tstVDBackendInfo();
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD-2: getting backend info test failed! rc=%Vrc\n", rc);

trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp

@@ -69 +69 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             VDDestroy(pVD); \
@@ -100 +100 @@
         RTFILE File;
         rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             RTFileClose(File);
@@ -126 +126 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             VDDestroy(pVD); \
@@ -153 +153 @@
     RTFILE File;
     rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTFileClose(File);
@@ -349 +349 @@
 {
     int rc = RTPRandInit(pCtx, u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         RTPrintf("ERROR: Failed to initialize random generator. RC=%Vrc\n", rc);
     else
@@ -464 +464 @@
     {
         int rc = VDRead(pVD, pSegment->u64Offset, pvBuf, pSegment->u32Length);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             RTPrintf("ERROR: Failed to read from virtual disk\n");
@@ -509 +509 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             if (pvBuf) \
@@ -535 +535 @@
     RTFILE File;
     rc = RTFileOpen(&File, pszBaseFilename, RTFILE_O_READ);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTFileClose(File);
         rc = VDGetFormat(pszBaseFilename, &pszFormat);
         RTPrintf("VDGetFormat() pszFormat=%s rc=%Vrc\n", pszFormat, rc);
-        if (VBOX_SUCCESS(rc) && strcmp(pszFormat, pszBackend))
+        if (RT_SUCCESS(rc) && strcmp(pszFormat, pszBackend))
         {
             rc = VERR_GENERAL_FAILURE;
@@ -633 +633 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             if (pvBuf) \
@@ -659 +659 @@
     RTFILE File;
     rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTFileClose(File);
@@ -712 +712 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             VDDestroy(pVD); \
@@ -746 +746 @@
 {
     int rc = tstVDCreateDelete("VMDK", src, cbSize, enmType, uFlags, false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = tstVmdkRename(src, dst);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -762 +762 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             VDCloseAll(pVD); \
@@ -801 +801 @@
     int rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", "tmpVDRename.vmdk", _4G,
                                  VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK rename (single extent, embedded descriptor, same dir) test failed! rc=%Vrc\n", rc);
@@ -808 +808 @@
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", "tmpVDRename.vmdk", _4G,
                                  VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK rename (multiple extent, separate descriptor, same dir) test failed! rc=%Vrc\n", rc);
@@ -815 +815 @@
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
                                  VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK rename (single extent, embedded descriptor, another dir) test failed! rc=%Vrc\n", rc);
@@ -822 +822 @@
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
                                  VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK rename (multiple extent, separate descriptor, another dir) test failed! rc=%Vrc\n", rc);
@@ -830 +830 @@
     RTFILE File;
     rc = RTFileOpen(&File, DST_PATH, RTFILE_O_CREATE | RTFILE_O_WRITE);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         RTFileClose(File);
 
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
                                  VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTPrintf("tstVD: VMDK rename (multiple extent, separate descriptor, another dir, already exists) test failed!\n");
@@ -891 +891 @@
     {
         rc = RTDirCreate("tmp", RTFS_UNIX_IRWXU);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             RTPrintf("tstVD: Failed to create 'tmp' directory! rc=%Vrc\n", rc);
@@ -902 +902 @@
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: dynamic VMDK create test failed! rc=%Vrc\n", rc);
@@ -910 +910 @@
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
                            false);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: dynamic VMDK create test failed! rc=%Vrc\n", rc);
@@ -916 +916 @@
     }
     rc = tstVDOpenDelete("VMDK", "tmpVDCreate.vmdk");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK delete test failed! rc=%Vrc\n", rc);
@@ -928 +928 @@
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: dynamic VDI create test failed! rc=%Vrc\n", rc);
@@ -936 +936 @@
                            VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: fixed VDI create test failed! rc=%Vrc\n", rc);
@@ -946 +946 @@
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: dynamic VMDK create test failed! rc=%Vrc\n", rc);
@@ -954 +954 @@
                            VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: dynamic split VMDK create test failed! rc=%Vrc\n", rc);
@@ -962 +962 @@
                            VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: fixed VMDK create test failed! rc=%Vrc\n", rc);
@@ -970 +970 @@
                            VD_IMAGE_TYPE_FIXED, VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: fixed split VMDK create test failed! rc=%Vrc\n", rc);
@@ -980 +980 @@
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: dynamic VHD create test failed! rc=%Vrc\n", rc);
@@ -988 +988 @@
                            VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
                            true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: fixed VHD create test failed! rc=%Vrc\n", rc);
@@ -996 +996 @@
 #ifdef VDI_TEST
     rc = tstVDOpenCreateWriteMerge("VDI", "tmpVDBase.vdi", "tmpVDDiff.vdi", u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VDI test failed (new image)! rc=%Vrc\n", rc);
@@ -1002 +1002 @@
     }
     rc = tstVDOpenCreateWriteMerge("VDI", "tmpVDBase.vdi", "tmpVDDiff.vdi", u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VDI test failed (existing image)! rc=%Vrc\n", rc);
@@ -1010 +1010 @@
 #ifdef VMDK_TEST
     rc = tstVDOpenCreateWriteMerge("VMDK", "tmpVDBase.vmdk", "tmpVDDiff.vmdk", u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK test failed (new image)! rc=%Vrc\n", rc);
@@ -1016 +1016 @@
     }
     rc = tstVDOpenCreateWriteMerge("VMDK", "tmpVDBase.vmdk", "tmpVDDiff.vmdk", u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VMDK test failed (existing image)! rc=%Vrc\n", rc);
@@ -1024 +1024 @@
 #ifdef VHD_TEST
     rc = tstVDCreateWriteOpenRead("VHD", "tmpVDCreate.vhd", u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VHD test failed (creating image)! rc=%Vrc\n", rc);
@@ -1031 +1031 @@
 
     rc = tstVDOpenCreateWriteMerge("VHD", "tmpVDBase.vhd", "tmpVDDiff.vhd", u32Seed);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("tstVD: VHD test failed (existing image)! rc=%Vrc\n", rc);

trunk/src/VBox/Devices/Storage/testcase/tstVDI.cpp

@@ -36 +36 @@
     { \
         RTPrintf("%s rc=%Vrc\n", str, rc); \
-        if (VBOX_FAILURE(rc)) \
+        if (RT_FAILURE(rc)) \
         { \
             VDIDiskCloseAllImages(pVdi); \
@@ -46 +46 @@
     int rc = VDIDiskOpenImage(pVdi, pszBaseFilename, VDI_OPEN_FLAGS_NORMAL);
     RTPrintf("openImage() rc=%Vrc\n", rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         rc = VDICreateBaseImage(pszBaseFilename, VDI_IMAGE_TYPE_NORMAL,

trunk/src/VBox/Devices/Storage/testcase/vditool.cpp

@@ -71 +71 @@
 {
     int rc = RTStrCurrentCPToUtf8(pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         RTPrintf("Error converting filename '%s' to UTF8! (rc=%Rrc)\n",
                  pszFilename, rc);
@@ -86 +86 @@
     if (rc == VINF_SUCCESS)
         RTPrintf("The operation completed successfully!\n");
-    else if (VBOX_SUCCESS(rc))
+    else if (RT_SUCCESS(rc))
         RTPrintf("The operation completed successfully! (rc=%Rrc)\n", rc);
     else
@@ -101 +101 @@
     char *pszUtf8Filename;
     int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -119 +119 @@
     char *pszUtf8Filename, *pszUtf8DDFilename;
     int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = FilenameToUtf8(&pszUtf8DDFilename, pszDDFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -128 +128 @@
     RTFILE File;
     rc = RTFileOpen(&File, pszUtf8DDFilename, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("File=\"%s\" open error: %Rrf\n", pszDDFilename, rc);
@@ -137 +137 @@
     uint64_t cbFile;
     rc = RTFileGetSize(File, &cbFile);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTPrintf("Creating fixed image with size %u Bytes...\n", (unsigned)cbFile);
@@ -145 +145 @@
                                 "Converted from DD test image", NULL, NULL);
         PrintDone(rc);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             RTPrintf("Writing data...\n");
             PVDIDISK pVdi = VDIDiskCreate();
             rc = VDIDiskOpenImage(pVdi, pszUtf8Filename, VDI_OPEN_FLAGS_NORMAL);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 /* alloc work buffer. */
@@ -161 +161 @@
                         size_t cbRead = 0;
                         rc = RTFileRead(File, pvBuf, VDIDiskGetBufferSize(pVdi), &cbRead);
-                        if (VBOX_FAILURE(rc) || !cbRead)
+                        if (RT_FAILURE(rc) || !cbRead)
                             break;
                         rc = VDIDiskWrite(pVdi, off, pvBuf, cbRead);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
                         off += cbRead;
@@ -177 +177 @@
             }
 
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 /* delete image on error */
@@ -215 +215 @@
     char *pszUtf8Filename;
     int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -232 +232 @@
     char *pszUtf8Filename;
     int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = VDIDiskOpenImage(pVdi, pszUtf8Filename, VDI_OPEN_FLAGS_READONLY);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         VDIDiskDumpImages(pVdi);
@@ -251 +251 @@
     char *pszUtf8Filename;
     int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = VDIDiskOpenImage(pVdi, pszUtf8Filename, VDI_OPEN_FLAGS_NORMAL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         PDMMEDIAGEOMETRY LCHSGeometry = {0, 0, 0};
@@ -273 +273 @@
     char *pszUtf8SrcFile, *pszUtf8DstFile;
     int rc = FilenameToUtf8(&pszUtf8SrcFile, pszSrcFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = FilenameToUtf8(&pszUtf8DstFile, pszDstFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -294 +294 @@
     char *pszUtf8SrcFile, *pszUtf8DstFile;
     int rc = FilenameToUtf8(&pszUtf8SrcFile, pszSrcFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = FilenameToUtf8(&pszUtf8DstFile, pszDstFile);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = VDIDiskOpenImage(pVdi, pszUtf8SrcFile, VDI_OPEN_FLAGS_NORMAL);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTFILE FileDst;
         rc = RTFileOpen(&FileDst, pszUtf8DstFile, RTFILE_O_CREATE | RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             uint64_t        cbSrc = VDIDiskGetSize(pVdi);
@@ -316 +316 @@
                 {
                     rc = VDIDiskRead(pVdi, off, pvBuf, cbBuf);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                     rc = RTFileWrite(FileDst, pvBuf, cbBuf, NULL);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                         break;
                     off += cbBuf;
@@ -341 +341 @@
     char *pszUtf8Filename;
     int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -384 +384 @@
         uint32_t cMBs;
         rc = RTStrToUInt32Ex(argv[3], NULL, 10, &cMBs);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return SyntaxError("Invalid number!");
         if (    cMBs < 2
@@ -442 +442 @@
 
     RTLogFlush(NULL);
-    return !VBOX_SUCCESS(rc);
-}
+    return !RT_SUCCESS(rc);
+}