Changeset 77625 in vbox

Timestamp:

Mar 8, 2019 8:44:54 PM (6 years ago)

Author:

vboxsync

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

129253

Message:

VBoxManage/handleCreateMedium: Build fixes.

File:

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

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

@@ -254 +254 @@
     const char *diffparent = NULL;
     uint64_t size = 0;
-    typedef struct MEDIUMPROPERTY_LIST {
+    typedef struct MEDIUMPROPERTY_LIST
+    {
         struct MEDIUMPROPERTY_LIST *next;
-        char *key;
-        char *value;
+        const char *key;
+        const char *value;
     } MEDIUMPROPERTY, *PMEDIUMPROPERTY;
     PMEDIUMPROPERTY pMediumProps = NULL;
-    enum {
+    enum
+    {
         CMD_NONE,
         CMD_DISK,
@@ -326 +328 @@
                 if (!pNewProp)
                     return errorArgument("Can't allocate memory for property '%s'", ValueUnion.psz);
-                size_t cbKvp = RTStrNLen(ValueUnion.psz, PROP_MAXLEN);
-                char *cp;
-                for (cp = (char *)ValueUnion.psz; *cp != '=' && cp < ValueUnion.psz + cbKvp; cp++)
-                    continue;
-                if (cp < ValueUnion.psz + cbKvp)
+                size_t cchKvp = RTStrNLen(ValueUnion.psz, PROP_MAXLEN);
+                char *pszEqual = (char *)memchr(ValueUnion.psz, '=', cchKvp);
+                if (pszEqual)
                 {
-                    *cp = '\0';
+                    *pszEqual = '\0';       /* Warning! Modifies argument string. */
                     pNewProp->next = NULL;
                     pNewProp->key = (char *)ValueUnion.psz;
-                    pNewProp->value = cp + 1;
+                    pNewProp->value = pszEqual + 1;
                 }
-                if (pMediumProps) {
+                if (pMediumProps)
+                {
                     PMEDIUMPROPERTY pProp;
                     for (pProp = pMediumProps; pProp->next; pProp = pProp->next)
@@ -345 +346 @@
                 else
                     pMediumProps = pNewProp;
+                break;
             }
+
             case 'F':   // --static ("fixed"/"flat")
             {
@@ -455 +458 @@
             else
                 strName.append(".vdi");
-        } else if (cmd == CMD_DVD)
+        }
+        else if (cmd == CMD_DVD)
             strName.append(".iso");
         else if (cmd == CMD_FLOPPY)
@@ -471 +475 @@
     else if (cmd == CMD_FLOPPY)
         rc = createMedium(a, format, filename, DeviceType_Floppy,
-                        AccessMode_ReadWrite, pMedium);
+                          AccessMode_ReadWrite, pMedium);
     else
         rc = E_INVALIDARG; /* cannot happen but make gcc happy */
@@ -486 +490 @@
                 pProp = next;
             }
-        }
 
         ComPtr<IProgress> pProgress;
@@ -506 +509 @@
             rc = showProgress(pProgress);
             CHECK_PROGRESS_ERROR(pProgress, ("Failed to create medium"));
+        }
     }