Changeset ab936440 in mainline for uspace/srv/fs/udf/udf_file.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_file.c (modified) (6 diffs)

uspace/srv/fs/udf/udf_file.c

@@ -114 +114 @@
                         if ((node->index >= node->instance->partitions[i].start) &&
                             (node->index < node->instance->partitions[i].start +
-                            node->instance->partitions[i].lenght)) {
+                            node->instance->partitions[i].length)) {
                                 if (node->instance->partitions[i].start >= min_start) {
                                         min_start = node->instance->partitions[i].start;
@@ -258 +258 @@
                             (udf_file_entry_descriptor_t *) block->data;
                         uint16_t icb_flag = FLE16(file->icbtag.flags) & UDF_ICBFLAG_MASK;
-                        node->data_size = FLE64(file->info_lenght);
+                        node->data_size = FLE64(file->info_length);
                         node->type = (file->icbtag.file_type == UDF_ICBTYPE_DIR) ? NODE_DIR : NODE_FILE;
 
                         rc = udf_read_allocation_sequence(node, (uint8_t *) file, icb_flag,
-                            FLE32(file->ea_lenght) + UDF_FE_OFFSET, FLE32(file->ad_lenght));
+                            FLE32(file->ea_length) + UDF_FE_OFFSET, FLE32(file->ad_length));
                         block_put(block);
                         return rc;
@@ -272 +272 @@
                             (udf_extended_file_entry_descriptor_t *) block->data;
                         icb_flag = FLE16(efile->icbtag.flags) & UDF_ICBFLAG_MASK;
-                        node->data_size = FLE64(efile->info_lenght);
+                        node->data_size = FLE64(efile->info_length);
                         node->type = (efile->icbtag.file_type == UDF_ICBTYPE_DIR) ? NODE_DIR : NODE_FILE;
 
                         rc = udf_read_allocation_sequence(node, (uint8_t *) efile, icb_flag,
-                            FLE32(efile->ea_lenght) + UDF_EFE_OFFSET, FLE32(efile->ad_lenght));
+                            FLE32(efile->ea_length) + UDF_EFE_OFFSET, FLE32(efile->ad_length));
                         block_put(block);
                         return rc;
@@ -338 +338 @@
 
                 /* According to ECMA 167 4/14.4.9 */
-                size_t padding = 4 * (((*fid)->lenght_file_id +
-                    FLE16((*fid)->lenght_iu) + 38 + 3) / 4) -
-                    ((*fid)->lenght_file_id + FLE16((*fid)->lenght_iu) + 38);
-                size_t size_fid = (*fid)->lenght_file_id +
-                    FLE16((*fid)->lenght_iu) + padding + 38;
+                size_t padding = 4 * (((*fid)->length_file_id +
+                    FLE16((*fid)->length_iu) + 38 + 3) / 4) -
+                    ((*fid)->length_file_id + FLE16((*fid)->length_iu) + 38);
+                size_t size_fid = (*fid)->length_file_id +
+                    FLE16((*fid)->length_iu) + padding + 38;
 
                 fid_sum += size_fid;
 
                 /* aAcording to ECMA 167 4/8.6 */
-                if (((*fid)->lenght_file_id != 0) &&
+                if (((*fid)->length_file_id != 0) &&
                     (((*fid)->file_characteristics & 4) == 0)) {
                         n++;
@@ -516 +516 @@
 
                         /* According to ECMA 167 4/14.4.9 */
-                        size_t padding = 4 * (((*fid)->lenght_file_id +
-                            FLE16((*fid)->lenght_iu) + 38 + 3) / 4) -
-                            ((*fid)->lenght_file_id + FLE16((*fid)->lenght_iu) + 38);
-                        size_t size_fid = (*fid)->lenght_file_id +
-                            FLE16((*fid)->lenght_iu) + padding + 38;
+                        size_t padding = 4 * (((*fid)->length_file_id +
+                            FLE16((*fid)->length_iu) + 38 + 3) / 4) -
+                            ((*fid)->length_file_id + FLE16((*fid)->length_iu) + 38);
+                        size_t size_fid = (*fid)->length_file_id +
+                            FLE16((*fid)->length_iu) + padding + 38;
                         if (buf_flag)
                                 fid_sum += size_fid - *len;
@@ -527 +527 @@
 
                         /* According to ECMA 167 4/8.6 */
-                        if (((*fid)->lenght_file_id != 0) &&
+                        if (((*fid)->length_file_id != 0) &&
                             (((*fid)->file_characteristics & 4) == 0)) {
                                 (*n)++;