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

Timestamp:

Sep 11, 2010 6:02:17 PM (14 years ago)

Author:

vboxsync

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

65796

Message:

scm cleanup

File:

• trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp (modified) (31 diffs)

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -88 +88 @@
 {
     va_list args;
-    
+
     va_start(args, pszFormat);
     RTPrintf("\n"
@@ -99 +99 @@
 {
     va_list args;
-    
+
     va_start(args, pszFormat);
     RTPrintf("\n"
@@ -120 +120 @@
     RTUuidClear(&parentUuid);
     int rc;
-    
+
     /* Parse the command line. */
     static const RTGETOPTDEF s_aOptions[] =
@@ -163 +163 @@
         }
     }
-    
+
     /* Check for mandatory parameters. */
     if (!pszFilename)
         return errorSyntax("Mandatory --filename option missing\n");
-    
+
     /* Check for consistency of optional parameters. */
     if (fSetImageUuid && RTUuidIsNull(&imageUuid))
         return errorSyntax("Invalid parameter to --uuid option\n");
-    
+
     /* Autodetect image format. */
     if (!pszFormat)
@@ -181 +181 @@
             return errorRuntime("Format autodetect failed: %Rrc\n", rc);
     }
-    
+
     PVBOXHDD pVD = NULL;
     rc = VDCreate(pVDIfs, &pVD);
     if (RT_FAILURE(rc))
         return errorRuntime("Cannot create the virtual disk container: %Rrc\n", rc);
-    
-    
+
+
     rc = VDOpen(pVD, pszFormat, pszFilename, VD_OPEN_FLAGS_NORMAL, NULL);
     if (RT_FAILURE(rc))
         return errorRuntime("Cannot open the virtual disk image \"%s\": %Rrc\n",
                             pszFilename, rc);
-    
+
     RTUUID oldImageUuid;
     rc = VDGetUuid(pVD, VD_LAST_IMAGE, &oldImageUuid);
@@ -198 +198 @@
         return errorRuntime("Cannot get UUID of virtual disk image \"%s\": %Rrc\n",
                             pszFilename, rc);
-    
+
     RTPrintf("Old image UUID:  %RTuuid\n", &oldImageUuid);
-    
+
     RTUUID oldParentUuid;
     rc = VDGetParentUuid(pVD, VD_LAST_IMAGE, &oldParentUuid);
@@ -206 +206 @@
         return errorRuntime("Cannot get parent UUID of virtual disk image \"%s\": %Rrc\n",
                             pszFilename, rc);
-    
+
     RTPrintf("Old parent UUID: %RTuuid\n", &oldParentUuid);
-    
+
     if (fSetImageUuid)
     {
@@ -217 +217 @@
                                 pszFilename, rc);
     }
-    
+
     if (fSetParentUuid)
     {
@@ -226 +226 @@
                                 pszFilename, rc);
     }
-    
+
     rc = VDCloseAll(pVD);
     if (RT_FAILURE(rc))
         return errorRuntime("Closing image failed! rc=%Rrc\n", rc);
-    
+
     if (pszFormat)
     {
@@ -236 +236 @@
         pszFormat = NULL;
     }
-    
-    return 0;    
+
+    return 0;
 }
 
@@ -252 +252 @@
     unsigned uImageFlags = VD_IMAGE_FLAGS_NONE;
     int rc = VINF_SUCCESS;
-    
+
     /* Parse the command line. */
     static const RTGETOPTDEF s_aOptions[] =
@@ -292 +292 @@
         }
     }
-    
+
     /* Check for mandatory parameters. */
     if (!pszSrcFilename)
@@ -298 +298 @@
     if (!pszDstFilename)
         return errorSyntax("Mandatory --dstfilename option missing\n");
-    
+
     /* check the variant parameter */
     if (pszVariant)
@@ -332 +332 @@
         }
     }
-    
+
     do
     {
@@ -363 +363 @@
         if (!pszDstFormat)
             pszDstFormat = "VDI";
-        
+
         rc = VDCreate(pVDIfs, &pDstDisk);
         if (RT_FAILURE(rc))
@@ -370 +370 @@
             break;
         }
-        
+
         uint64_t cbSize = VDGetSize(pSrcDisk, VD_LAST_IMAGE);
         RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB)...\n", pszSrcFilename, cbSize, (cbSize + _1M - 1) / _1M);
-        
+
         /* Create the output image */
         rc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, pszDstFormat,
@@ -382 +382 @@
             break;
         }
-            
+
     }
     while (0);
-        
+
     if (pDstDisk)
         VDCloseAll(pDstDisk);
     if (pSrcDisk)
         VDCloseAll(pSrcDisk);
-    
+
     return RT_SUCCESS(rc) ? 0 : 1;
 }
@@ -417 +417 @@
                 pszFilename = ValueUnion.psz;
                 break;
-                
+
             default:
                 ch = RTGetOptPrintError(ch, &ValueUnion);
@@ -424 +424 @@
         }
     }
-    
+
     /* Check for mandatory parameters. */
     if (!pszFilename)
         return errorSyntax("Mandatory --filename option missing\n");
-    
+
     /* just try it */
     char *pszFormat = NULL;
@@ -438 +438 @@
     if (RT_FAILURE(rc))
         return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
-    
+
     /* Open the image */
     rc = VDOpen(pDisk, pszFormat, pszFilename, VD_OPEN_FLAGS_INFO, NULL);
     if (RT_FAILURE(rc))
         return errorRuntime("Error while opening the image: %Rrc\n", rc);
-    
+
     VDDumpImages(pDisk);
-    
+
     VDCloseAll(pDisk);
-    
+
     return rc;
 }
@@ -456 +456 @@
     PVBOXHDD pDisk = NULL;
     const char *pszFilename = NULL;
-    
+
     /* Parse the command line. */
     static const RTGETOPTDEF s_aOptions[] =
@@ -473 +473 @@
                 pszFilename = ValueUnion.psz;
                 break;
-                
+
             default:
                 ch = RTGetOptPrintError(ch, &ValueUnion);
@@ -480 +480 @@
         }
     }
-    
+
     /* Check for mandatory parameters. */
     if (!pszFilename)
         return errorSyntax("Mandatory --filename option missing\n");
-    
+
     /* just try it */
     char *pszFormat = NULL;
@@ -490 +490 @@
     if (RT_FAILURE(rc))
         return errorSyntax("Format autodetect failed: %Rrc\n", rc);
-    
+
     rc = VDCreate(pVDIfs, &pDisk);
     if (RT_FAILURE(rc))
         return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
-    
+
     /* Open the image */
     rc = VDOpen(pDisk, pszFormat, pszFilename, VD_OPEN_FLAGS_NORMAL, NULL);
     if (RT_FAILURE(rc))
         return errorRuntime("Error while opening the image: %Rrc\n", rc);
-    
+
     rc = VDCompact(pDisk, 0, NULL);
     if (RT_FAILURE(rc))
         errorRuntime("Error while compacting image: %Rrc\n", rc);
-    
+
     VDCloseAll(pDisk);
-    
+
     return rc;
 }
@@ -516 +516 @@
              "(C) 2005-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
              "All rights reserved.\n"
-             "\n");    
+             "\n");
 }
 
@@ -530 +530 @@
     int  iCmd      = 1;
     int  iCmdArg;
-    
+
     /* global options */
     for (int i = 1; i < argc || argc <= iCmd; i++)
@@ -545 +545 @@
             return 0;
         }
-        
+
         if (   !strcmp(argv[i], "-v")
             || !strcmp(argv[i], "-version")
@@ -569 +569 @@
         }
     }
-    
+
     iCmdArg = iCmd + 1;
-    
+
     if (fShowLogo)
         showLogo();
@@ -582 +582 @@
     vdInterfaceErrorCallbacks.pfnError     = handleVDError;
     vdInterfaceErrorCallbacks.pfnMessage   = handleVDMessage;
-    
+
     rc = VDInterfaceAdd(&vdInterfaceError, "VBoxManage_IError", VDINTERFACETYPE_ERROR,
                         &vdInterfaceErrorCallbacks, NULL, &pVDIfs);
-    
+
     rc = VDInit();
     if (RT_FAILURE(rc))
         return errorSyntax("Initalizing backends failed! rc=%Rrc\n");
-    
+
     /*
      * All registered command handlers
@@ -614 +614 @@
             handlerArg.argc = argc - iCmdArg;
             handlerArg.argv = &argv[iCmdArg];
-            
+
             rc = s_commandHandlers[commandIndex].handler(&handlerArg);
             break;
@@ -620 +620 @@
     }
     if (!s_commandHandlers[commandIndex].command)
-        return errorSyntax("Invalid command '%s'", argv[iCmd]);        
+        return errorSyntax("Invalid command '%s'", argv[iCmd]);
 
     rc = VDShutdown();
     if (RT_FAILURE(rc))
         return errorSyntax("Unloading backends failed! rc=%Rrc\n", rc);
-    
+
     return rc;
 }