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

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.c (modified) (8 diffs)

uspace/srv/fs/udf/udf_volume.c

@@ -386 +386 @@
                 udf_file_entry_descriptor_t *fed =
                     (udf_file_entry_descriptor_t *) block->data;
-                uint32_t start_alloc = FLE32(fed->ea_lenght) + UDF_FE_OFFSET;
+                uint32_t start_alloc = FLE32(fed->ea_length) + UDF_FE_OFFSET;
                 udf_short_ad_t *short_d =
                     (udf_short_ad_t *) ((uint8_t *) fed + start_alloc);
                 instance->partitions[id].start = FLE32(short_d->position);
-                instance->partitions[id].lenght = FLE32(short_d->length);
+                instance->partitions[id].length = FLE32(short_d->length);
                 break;
 
@@ -398 +398 @@
                 udf_extended_file_entry_descriptor_t *efed =
                     (udf_extended_file_entry_descriptor_t *) block->data;
-                start_alloc = FLE32(efed->ea_lenght) + UDF_EFE_OFFSET;
+                start_alloc = FLE32(efed->ea_length) + UDF_EFE_OFFSET;
                 short_d = (udf_short_ad_t *) ((uint8_t *) efed + start_alloc);
                 instance->partitions[id].start = FLE32(short_d->position);
-                instance->partitions[id].lenght = FLE32(short_d->length);
+                instance->partitions[id].length = FLE32(short_d->length);
                 break;
         }
@@ -503 +503 @@
                                 instance->partitions[j].access_type =
                                     FLE32(pd[pd_num].access_type);
-                                instance->partitions[j].lenght =
+                                instance->partitions[j].length =
                                     FLE32(pd[pd_num].length);
                                 instance->partitions[j].number =
@@ -518 +518 @@
 
                                 instance->volumes[i].partition_cnt++;
-                                idx += pm1->partition_map_lenght;
+                                idx += pm1->partition_map_length;
                                 continue;
                         }
@@ -586 +586 @@
                             "found and skipped", i, pm->partition_map_type);
 
-                        idx += pm->partition_map_lenght;
+                        idx += pm->partition_map_length;
                 }
         }
@@ -710 +710 @@
                                     FLE32(vol->partition.starting_location) +
                                     FLE32(phd->unallocated_space_table.position);
-                                instance->uaspace_lenght =
+                                instance->uaspace_length =
                                     FLE32(phd->unallocated_space_table.length);
                         }
@@ -724 +724 @@
                                     FLE32(vol->partition.starting_location) +
                                     FLE32(phd->unallocated_space_bitmap.position);
-                                instance->uaspace_lenght =
+                                instance->uaspace_length =
                                     FLE32(phd->unallocated_space_bitmap.length);
                         }
@@ -773 +773 @@
                             sizeof(udf_extent_t)), sizeof(udf_common_descriptor_t));
                         instance->uaspace_start = pos;
-                        instance->uaspace_lenght = sct;
+                        instance->uaspace_length = sct;
                         instance->uasd = (udf_unallocated_space_descriptor_t *)
                             malloc(sct * instance->sector_size);