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

Timestamp:

Feb 4, 2016 3:01:22 PM (9 years ago)

Author:

vboxsync

Message:

ApplianceImplImport.cpp: Simplifications.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (3 diffs)

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

@@ -2076 +2076 @@
     else
     {
-        bool fGzipUsed = !(di.strCompression.compare("gzip",Utf8Str::CaseInsensitive));
+        bool fGzipUsed = di.strCompression.compare("gzip",Utf8Str::CaseInsensitive) == 0;
         /* check read file to GZIP compression */
         try
@@ -2135 +2135 @@
             bool chExt = m->optListImport.contains(ImportOptions_ImportToVDI);
 
-            char *pszSuff = NULL;
-
-            if ((pszSuff = RTPathSuffix(strTargetPath->c_str()))!=NULL)
+            char *pszSuff = RTPathSuffix(strTargetPath->c_str());
+            if (pszSuff != NULL)
             {
                 /*
@@ -2183 +2182 @@
                 if (FAILED(rc))
                     throw rc;
-                else
-                {
-                    for (ULONG j = 0; j < mediumFormatCap.size(); j++)
-                        lCabs |= mediumFormatCap[j];
-                }
-
-                if (!(   ((lCabs & MediumFormatCapabilities_CreateFixed) == MediumFormatCapabilities_CreateFixed)
-                      || ((lCabs & MediumFormatCapabilities_CreateDynamic) == MediumFormatCapabilities_CreateDynamic)))
+
+                for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+                    lCabs |= mediumFormatCap[j];
+
+                if (   !(lCabs & MediumFormatCapabilities_CreateFixed)
+                    && !(lCabs & MediumFormatCapabilities_CreateDynamic) )
                     throw setError(VBOX_E_NOT_SUPPORTED,
                                    tr("Could not find a valid medium format for the target disk '%s'"),