Changeset ab936440 in mainline for uspace/srv/fs/udf/udf_volume.h

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/srv/fs/udf/udf_volume.h (modified) (2 diffs)

uspace/srv/fs/udf/udf_volume.h

@@ -49 +49 @@
 #define UDF_TAG_LVID  0x0009  /* Logical Volume Integrity Descriptor */
 
-/* Start adress of Anchor Volume Descriptor */
+/* Start address of Anchor Volume Descriptor */
 #define UDF_AVDP_SECTOR  256
 
@@ -165 +165 @@
 typedef struct udf_general_type {
         uint8_t partition_map_type;
-        uint8_t partition_map_lenght;
+        uint8_t partition_map_length;
 } __attribute__((packed)) udf_general_type_t;
 
 typedef struct udf_type1_partition_map {
         uint8_t partition_map_type;
-        uint8_t partition_map_lenght;
+        uint8_t partition_map_length;
         uint16_t volume_sequence_number;
         uint16_t partition_number;