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

Timestamp:

Nov 28, 2008 2:36:22 PM (16 years ago)

Author:

vboxsync

Message:

VBoxHDD: simplify config handling. Treat everything as a string, and do the conversion in the common code. Makes the job of implementing the VBox API (iSCSI in particular) easier.

File:

• trunk/src/VBox/Main/HardDiskFormatImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HardDiskFormatImpl.cpp

@@ -95 +95 @@
                     dt = DataType_Int32;
                     /* If there is a default value get them in the right format */
-                    if (pa->pDefaultValue)
-                        defaultValue =
-                            Utf8StrFmt ("%d", pa->pDefaultValue->Integer.u64);
+                    if (pa->pszDefaultValue)
+                        defaultValue = pa->pszDefaultValue;
                     break;
                 }
@@ -104 +103 @@
                     dt = DataType_Int8;
                     /* If there is a default value get them in the right format */
-                    if (pa->pDefaultValue)
+                    if (pa->pszDefaultValue)
                     {
-                        /* Copy the bytes over */
-                        defaultValue.alloc (pa->pDefaultValue->Bytes.cb + 1);
-                        memcpy (defaultValue.mutableRaw(), pa->pDefaultValue->Bytes.pv,
-                                pa->pDefaultValue->Bytes.cb);
-                        defaultValue.mutableRaw() [defaultValue.length()] = 0;
+                        /* Copy the bytes over - treated simply as a string */
+                        defaultValue = pa->pszDefaultValue;
                         flags |= DataFlags_Array;
                     }
@@ -119 +115 @@
                     dt = DataType_String;
                     /* If there is a default value get them in the right format */
-                    if (pa->pDefaultValue)
-                        defaultValue = pa->pDefaultValue->String.psz;
+                    if (pa->pszDefaultValue)
+                        defaultValue = pa->pszDefaultValue;
                     break;
                 }