Changeset 3bacee1 in mainline for uspace/lib/ext4/src

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/lib/ext4/src

Files:

• directory.c (modified) (1 diff)
• directory_index.c (modified) (2 diffs)
• extent.c (modified) (2 diffs)
• ops.c (modified) (3 diffs)

uspace/lib/ext4/src/directory.c

@@ -314 +314 @@
         /* Ensure the name length is not too large */
         if (ext4_directory_entry_ll_get_name_length(
-            it->inode_ref->fs->superblock, entry) > length-8)
+            it->inode_ref->fs->superblock, entry) > length - 8)
                 return EIO;
 

uspace/lib/ext4/src/directory_index.c

@@ -834 +834 @@
         /* Check hash collision */
         uint32_t continued = 0;
-        if (new_hash == sort_array[mid-1].hash)
+        if (new_hash == sort_array[mid - 1].hash)
                 continued = 1;
 
@@ -898 +898 @@
  */
 static errno_t ext4_directory_dx_split_index(ext4_inode_ref_t *inode_ref,
-                ext4_directory_dx_block_t *dx_blocks, ext4_directory_dx_block_t *dx_block)
+    ext4_directory_dx_block_t *dx_blocks, ext4_directory_dx_block_t *dx_block)
 {
         ext4_directory_dx_entry_t *entries;

uspace/lib/ext4/src/extent.c

@@ -420 +420 @@
 
         /* Search extent in the leaf block */
-        ext4_extent_t* extent = NULL;
+        ext4_extent_t *extent = NULL;
         ext4_extent_binsearch(header, &extent, iblock);
 
@@ -565 +565 @@
  */
 static errno_t ext4_extent_release_branch(ext4_inode_ref_t *inode_ref,
-                ext4_extent_index_t *index)
+    ext4_extent_index_t *index)
 {
         uint32_t fblock = ext4_extent_index_get_leaf(index);
 
-        block_t* block;
+        block_t *block;
         errno_t rc = block_get(&block, inode_ref->fs->device, fblock, BLOCK_FLAGS_NONE);
         if (rc != EOK)

uspace/lib/ext4/src/ops.c

@@ -71 +71 @@
 static errno_t ext4_node_get(fs_node_t **, service_id_t, fs_index_t);
 static errno_t ext4_node_open(fs_node_t *);
-       errno_t ext4_node_put(fs_node_t *);
+errno_t ext4_node_put(fs_node_t *);
 static errno_t ext4_create_node(fs_node_t **, service_id_t, int);
 static errno_t ext4_destroy_node(fs_node_t *);
@@ -118 +118 @@
         ext4_node_t *enode = hash_table_get_inst(item, ext4_node_t, link);
 
-        return key->service_id == enode->instance->service_id
-                && key->index == enode->inode_ref->index;
+        return key->service_id == enode->instance->service_id &&
+            key->index == enode->inode_ref->index;
 }
 
@@ -1141 +1141 @@
                 break;
 
-skip:
+        skip:
                 rc = ext4_directory_iterator_next(&it);
                 if (rc != EOK) {