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

Timestamp:

2012-01-22T13:22:56Z (12 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_directory.c (modified) (6 diffs)

uspace/lib/ext4/libext4_directory.c

@@ -125 +125 @@
         int rc;
 
-        uint64_t size;
-        aoff64_t current_block_idx;
-        aoff64_t next_block_idx;
-        uint32_t next_block_phys_idx;
-        uint32_t block_size;
-
-        size = ext4_inode_get_size(it->fs->superblock, it->inode_ref->inode);
+        uint64_t size = ext4_inode_get_size(it->fs->superblock, it->inode_ref->inode);
 
         /* The iterator is not valid until we seek to the desired position */
@@ -150 +144 @@
         }
 
-        block_size = ext4_superblock_get_block_size(it->fs->superblock);
-        current_block_idx = it->current_offset / block_size;
-        next_block_idx = pos / block_size;
+        uint32_t block_size = ext4_superblock_get_block_size(it->fs->superblock);
+        aoff64_t current_block_idx = it->current_offset / block_size;
+        aoff64_t next_block_idx = pos / block_size;
 
         /* If we don't have a block or are moving accross block boundary,
@@ -166 +160 @@
                 }
 
+                uint32_t next_block_phys_idx;
                 rc = ext4_filesystem_get_inode_data_block_index(it->fs,
                     it->inode_ref->inode, next_block_idx, &next_block_phys_idx);
@@ -188 +183 @@
     uint32_t block_size)
 {
+
+        it->current = NULL;
+
         uint32_t offset_in_block = it->current_offset % block_size;
-
-        it->current = NULL;
 
         /* Ensure proper alignment */
@@ -439 +435 @@
 {
         int rc;
-        ext4_directory_iterator_t it;
 
         if (!ext4_inode_is_type(fs->superblock, parent->inode,
@@ -446 +441 @@
         }
 
+        ext4_directory_iterator_t it;
         rc = ext4_directory_iterator_init(&it, fs, parent, 0);
         if (rc != EOK) {