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

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.

File:

• trunk/src/VBox/Devices/Storage/testcase/vditool.cpp (modified) (18 diffs)

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);
+}