Changeset 107757 in vbox

Timestamp:

Jan 14, 2025 1:27:34 PM (2 months ago)

Author:

vboxsync

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

166869

Message:

src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp: Fixed warnings found by Parfait (unused assignment). jiraref:VBP-1424

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (9 diffs)

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

@@ -667 +667 @@
 RTEXITCODE handleModifyMedium(HandlerArg *a)
 {
-    HRESULT hrc;
     int vrc;
     enum {
@@ -741 +740 @@
                 if (pszProperty)
                 {
-                    char *pDelimiter = strchr(pszProperty, '=');
-                    if (pDelimiter)
+                    char *pszDelimiter = strchr(pszProperty, '=');
+                    if (pszDelimiter)
                     {
-                        *pDelimiter = '\0';
+                        *pszDelimiter = '\0';
 
                         Bstr bstrName(pszProperty);
-                        Bstr bstrValue(&pDelimiter[1]);
+                        Bstr bstrValue(&pszDelimiter[1]);
                         bstrName.detachTo(mediumPropNames.appendedRaw());
                         bstrValue.detachTo(mediumPropValues.appendedRaw());
                         fModifyProperties = true;
                     }
-                    else
-                    {
-                        errorArgument(Disk::tr("Invalid --property argument '%s'"), ValueUnion.psz);
-                        hrc = E_FAIL;
-                    }
+
                     RTStrFree(pszProperty);
+
+                    if (!pszDelimiter)
+                        return errorArgument(Disk::tr("Invalid --property argument '%s'"), ValueUnion.psz);
                 }
                 else
@@ -763 +761 @@
                     RTStrmPrintf(g_pStdErr, Disk::tr("Error: Failed to allocate memory for medium property '%s'\n"),
                                  ValueUnion.psz);
-                    hrc = E_FAIL;
+                    return RTEXITCODE_FAILURE;
                 }
                 break;
@@ -841 +839 @@
         )
         return errorSyntax(Disk::tr("No operation specified"));
+
+    HRESULT hrc;
 
     /* Always open the medium if necessary, there is no other way. */
@@ -956 +956 @@
             if (SUCCEEDED(hrc) && !pProgress.isNull())
             {
-                hrc = showProgress(pProgress);
+                showProgress(pProgress);
                 CHECK_PROGRESS_ERROR(pProgress, (Disk::tr("Failed to move medium")));
             }
@@ -1205 +1205 @@
 
 
-        hrc = showProgress(pProgress);
+        showProgress(pProgress);
         CHECK_PROGRESS_ERROR_BREAK(pProgress, (Disk::tr("Failed to clone medium")));
 
@@ -1773 +1773 @@
 RTEXITCODE handleCloseMedium(HandlerArg *a)
 {
-    HRESULT hrc = S_OK;
     enum {
         CMD_NONE,
@@ -1842 +1841 @@
     if (cmd == CMD_NONE)
         cmd = CMD_DISK;
+
     if (!pszFilenameOrUuid)
         return errorSyntax(Disk::tr("Medium name or UUID required"));
+
+    HRESULT hrc = S_OK;
 
     ComPtr<IMedium> pMedium;
@@ -1867 +1869 @@
             if (SUCCEEDED(hrc))
             {
-                hrc = showProgress(pProgress);
+                showProgress(pProgress);
                 CHECK_PROGRESS_ERROR(pProgress, (Disk::tr("Failed to delete medium")));
             }