Changeset 32718 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

Timestamp:

Sep 23, 2010 12:57:52 PM (14 years ago)

Author:

vboxsync

Message:

com/string: Remove bool conversion operator and other convenience error operators. They are hiding programming errors (like incorrect empty string checks, and in one case a free of the wrong pointer).

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -248 +248 @@
             pszAbsFilePath = RTPathAbsDup(strOvfFilename.c_str());
         ComPtr<IProgress> progressRead;
-        CHECK_ERROR_BREAK(pAppliance, Read(Bstr(pszAbsFilePath), progressRead.asOutParam()));
+        CHECK_ERROR_BREAK(pAppliance, Read(Bstr(pszAbsFilePath).raw(),
+                                           progressRead.asOutParam()));
         RTStrFree(pszAbsFilePath);
 
@@ -831 +832 @@
                     ComPtr<IMachine> machine;
                     /* assume it's a UUID */
-                    rc = a->virtualBox->GetMachine(Bstr(strMachine), machine.asOutParam());
+                    rc = a->virtualBox->GetMachine(Bstr(strMachine).raw(),
+                                                   machine.asOutParam());
                     if (FAILED(rc) || !machine)
                     {
                         /* must be a name */
-                        CHECK_ERROR_BREAK(a->virtualBox, FindMachine(Bstr(strMachine), machine.asOutParam()));
+                        CHECK_ERROR_BREAK(a->virtualBox, FindMachine(Bstr(strMachine).raw(),
+                                                                     machine.asOutParam()));
                     }
 
@@ -910 +913 @@
                 {
                     if (itD->first == "product")
-                        pVSD->AddDescription (VirtualSystemDescriptionType_Product, Bstr(itD->second), Bstr(itD->second));
+                        pVSD->AddDescription(VirtualSystemDescriptionType_Product,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "producturl")
-                        pVSD->AddDescription (VirtualSystemDescriptionType_ProductUrl, Bstr(itD->second), Bstr(itD->second));
+                        pVSD->AddDescription(VirtualSystemDescriptionType_ProductUrl,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "vendor")
-                        pVSD->AddDescription (VirtualSystemDescriptionType_Vendor, Bstr(itD->second), Bstr(itD->second));
+                        pVSD->AddDescription(VirtualSystemDescriptionType_Vendor,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "vendorurl")
-                        pVSD->AddDescription (VirtualSystemDescriptionType_VendorUrl, Bstr(itD->second), Bstr(itD->second));
+                        pVSD->AddDescription(VirtualSystemDescriptionType_VendorUrl,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "version")
-                        pVSD->AddDescription (VirtualSystemDescriptionType_Version, Bstr(itD->second), Bstr(itD->second));
+                        pVSD->AddDescription(VirtualSystemDescriptionType_Version,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "eula")
-                        pVSD->AddDescription (VirtualSystemDescriptionType_License, Bstr(itD->second), Bstr(itD->second));
+                        pVSD->AddDescription(VirtualSystemDescriptionType_License,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "eulafile")
                     {
@@ -930 +945 @@
                         {
                             Bstr bstrContent((char*)pvFile);
-                            pVSD->AddDescription(VirtualSystemDescriptionType_License, bstrContent, bstrContent);
+                            pVSD->AddDescription(VirtualSystemDescriptionType_License,
+                                                 bstrContent.raw(),
+                                                 bstrContent.raw());
                             RTFileReadAllFree(pvFile, cbFile);
                         }
@@ -955 +972 @@
         else
             pszAbsFilePath = RTPathAbsDup(strOutputFile.c_str());
-        CHECK_ERROR_BREAK(pAppliance, Write(Bstr(strOvfFormat), fManifest, Bstr(pszAbsFilePath), progress.asOutParam()));
+        CHECK_ERROR_BREAK(pAppliance, Write(Bstr(strOvfFormat).raw(),
+                                            fManifest,
+                                            Bstr(pszAbsFilePath).raw(),
+                                            progress.asOutParam()));
         RTStrFree(pszAbsFilePath);