Changeset d9bbe45 in mainline for uspace/lib/ext4/libext4_inode.c

Timestamp:

2012-01-22T13:22:56Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fcae007

Parents:

b7e0260

Message:

Refafctorization - principle of locality in variables declaration

File:

• uspace/lib/ext4/libext4_inode.c (modified) (3 diffs)

uspace/lib/ext4/libext4_inode.c

@@ -160 +160 @@
 uint64_t ext4_inode_get_blocks_count(ext4_superblock_t *sb, ext4_inode_t *inode)
 {
-        uint64_t count;
-
         if (ext4_superblock_has_feature_read_only(sb, EXT4_FEATURE_RO_COMPAT_HUGE_FILE)) {
 
                 /* 48-bit field */
-                count = ((uint64_t)uint16_t_le2host(inode->osd2.linux2.blocks_high)) << 32 |
+                uint64_t count = ((uint64_t)uint16_t_le2host(inode->osd2.linux2.blocks_high)) << 32 |
                                 uint32_t_le2host(inode->blocks_count_lo);
 
@@ -283 +281 @@
 uint32_t ext4_inode_get_extent_block(ext4_inode_t *inode, uint64_t idx, service_id_t service_id)
 {
+        int rc;
+
+        block_t* block = NULL;
+
         ext4_extent_header_t *header = ext4_inode_get_extent_header(inode);
-        ext4_extent_t *extent;
-        ext4_extent_index_t *extent_index;
-
-        uint32_t first_block;
-        uint16_t block_count;
-        uint64_t phys_block = 0;
-        uint64_t child;
-
-        int rc;
-        block_t* block = NULL;
-
         while (ext4_extent_header_get_depth(header) != 0) {
 
-                extent_index = EXT4_EXTENT_FIRST_INDEX(header);
+                ext4_extent_index_t *extent_index = EXT4_EXTENT_FIRST_INDEX(header);
 
                 for (uint16_t i = 0; i < ext4_extent_header_get_entries_count(header); ++i) {
-                        if(idx >= ext4_extent_index_get_first_block(extent_index)) {
-
-                                child = ext4_extent_index_get_leaf(extent_index);
+                        if (idx >= ext4_extent_index_get_first_block(extent_index)) {
+
+                                uint64_t child = ext4_extent_index_get_leaf(extent_index);
 
                                 if (block != NULL) {
@@ -319 +310 @@
         }
 
-        extent = EXT4_EXTENT_FIRST(header);
+        ext4_extent_t *extent = EXT4_EXTENT_FIRST(header);
+        uint64_t phys_block = 0;
 
         for (uint16_t i = 0; i < ext4_extent_header_get_entries_count(header); ++i) {
 
-                first_block = ext4_extent_get_first_block(extent);
-                block_count = ext4_extent_get_block_count(extent);
+                uint32_t first_block = ext4_extent_get_first_block(extent);
+                uint16_t block_count = ext4_extent_get_block_count(extent);
 
                 if ((idx >= first_block) && (idx < first_block + block_count)) {
-                        phys_block = ext4_extent_get_start(extent) + idx;
-                        phys_block -= ext4_extent_get_first_block(extent);
-
-                        // Memory leak prevention
-                        if (block != NULL) {
-                                block_put(block);
-                        }
-                        return phys_block;
+                         phys_block = ext4_extent_get_start(extent) + idx;
+                         phys_block -= ext4_extent_get_first_block(extent);
+
+                         // Memory leak prevention
+                         if (block != NULL) {
+                                 block_put(block);
+                         }
+                         return phys_block;
                 }
                 // Go to the next extent