Changeset 85884 in vbox for trunk/include/VBox

Timestamp:

Aug 25, 2020 7:59:36 PM (5 years ago)

Author:

vboxsync

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

140060

Message:

VBoxInternalManager.cpp,vd.h: Use self documenting structure names in VDISKRAWPARTDESC when it comes to the two offsets. bugref:9224

File:

• trunk/include/VBox/vd.h (modified) (4 diffs)

trunk/include/VBox/vd.h

@@ -130 +130 @@
 /** @} */
 
-/** @name VBox raw disk or partition flags
+/** @name VDISKRAW_XXX - VBox raw disk or partition flags
  * @{
  */
@@ -144 +144 @@
 
 /**
- * Auxiliary type for describing partitions on raw disks. The entries must be
- * in ascending order (as far as uStart is concerned), and must not overlap.
- * Note that this does not correspond 1:1 to partitions, it is describing the
- * general meaning of contiguous areas on the disk.
+ * Auxiliary type for describing partitions on raw disks.
+ *
+ * The entries must be in ascending order (as far as uStart is concerned), and
+ * must not overlap. Note that this does not correspond 1:1 to partitions, it is
+ * describing the general meaning of contiguous areas on the disk.
  */
 typedef struct VDISKRAWPARTDESC
@@ -161 +162 @@
     const void      *pvPartitionData;
     /** Offset where the data starts in this device. */
-    uint64_t        uStartOffset;
+    uint64_t        offStartInDevice;
     /** Offset where the data starts in the disk. */
-    uint64_t        uStart;
+    uint64_t        offStartInVDisk;
     /** Size of the data area. */
     uint64_t        cbData;
-    /** Flags for special treatment, see VDISKRAW_FLAGS_*. */
+    /** Flags for special treatment, see VDISKRAW_XXX. */
     uint32_t        uFlags;
 } VDISKRAWPARTDESC, *PVDISKRAWPARTDESC;
 
 /**
- * Auxiliary data structure for difference between GPT and MBR
- * disks.
+ * Auxiliary data structure for difference between GPT and MBR disks.
  */
 typedef enum VDISKPARTTYPE
@@ -188 +188 @@
      * to make logging of the comment string produce sensible results. */
     char            szSignature[4];
-    /** Flags for special treatment, see VDISKRAW_FLAGS_*. */
-    /** Flag whether access to full disk should be given (ignoring the
-     * partition information below). */
+    /** Flags for special treatment, see VDISKRAW_XXX. */
     uint32_t        uFlags;
     /** Filename for the raw disk. Ignored for partitioned raw disks.
      * For Linux e.g. /dev/sda, and for Windows e.g. //./PhysicalDisk0. */
-    const char      *pszRawDisk;
+    char           *pszRawDisk;
+    /** Partitioning type of the disk */
+    VDISKPARTTYPE   enmPartitioningType;
     /** Number of entries in the partition descriptor array. */
-    unsigned        cPartDescs;
+    uint32_t        cPartDescs;
     /** Pointer to the partition descriptor array. */
     PVDISKRAWPARTDESC pPartDescs;
-    /** Partitioning type of the disk */
-    VDISKPARTTYPE uPartitioningType;
 } VDISKRAW, *PVDISKRAW;