Changes in uspace/lib/ext2/libext2_directory.c [911ee54:18626b3] in mainline

File:

• uspace/lib/ext2/libext2_directory.c (modified) (7 diffs)

uspace/lib/ext2/libext2_directory.c

@@ -40 +40 @@
 #include <assert.h>
 
-static int ext2_directory_iterator_set(ext2_directory_iterator_t *it,
-    uint32_t block_size);
-
 /**
  * Get inode number for the directory entry
@@ -93 +90 @@
         int rc;
         uint32_t block_id;
-        uint32_t block_size;
-        
         it->inode_ref = inode_ref;
         it->fs = fs;
         
-        /* Get the first data block, so we can get the first entry */
+        // Get the first data block, so we can get first entry
         rc = ext2_filesystem_get_inode_data_block_index(fs, inode_ref->inode, 0, 
             &block_id);
@@ -110 +105 @@
         }
         
-        block_size = ext2_superblock_get_block_size(fs->superblock);
-        
-        it->current_offset = 0; 
-        return ext2_directory_iterator_set(it, block_size);
+        it->current = it->current_block->data;
+        it->current_offset = 0;
+        
+        return EOK;
 }
 
@@ -131 +126 @@
         uint32_t next_block_phys_idx;
         uint32_t block_size;
+        uint32_t offset_in_block;
         
         assert(it->current != NULL);
@@ -137 +133 @@
         size = ext2_inode_get_size(it->fs->superblock, it->inode_ref->inode);
         
-        /* Are we at the end? */
+        // Are we at the end?
         if (it->current_offset + skip >= size) {
                 rc = block_put(it->current_block);
@@ -154 +150 @@
         next_block_idx = (it->current_offset + skip) / block_size;
         
-        /* If we are moving accross block boundary,
-         * we need to get another block
-         */
+        // If we are moving accross block boundary,
+        // we need to get another block
         if (current_block_idx != next_block_idx) {
                 rc = block_put(it->current_block);
@@ -179 +174 @@
         }
         
+        offset_in_block = (it->current_offset + skip) % block_size;
+        
+        // Ensure proper alignment
+        if ((offset_in_block % 4) != 0) {
+                it->current = NULL;
+                return EIO;
+        }
+        
+        // Ensure that the core of the entry does not overflow the block
+        if (offset_in_block > block_size - 8) {
+                it->current = NULL;
+                return EIO;
+        }
+                
+        it->current = it->current_block->data + offset_in_block;
         it->current_offset += skip;
-        return ext2_directory_iterator_set(it, block_size);
-}
-
-static int ext2_directory_iterator_set(ext2_directory_iterator_t *it,
-    uint32_t block_size)
-{
-        uint32_t offset_in_block = it->current_offset % block_size;
-        
-        it->current = NULL;
-        
-        /* Ensure proper alignment */
-        if ((offset_in_block % 4) != 0) {
-                return EIO;
-        }
-        
-        /* Ensure that the core of the entry does not overflow the block */
-        if (offset_in_block > block_size - 8) {
-                return EIO;
-        }
-        
-        ext2_directory_entry_ll_t *entry = it->current_block->data + offset_in_block;
-        
-        /* Ensure that the whole entry does not overflow the block */
-        uint16_t length = ext2_directory_entry_ll_get_entry_length(entry);
-        if (offset_in_block + length > block_size) {
-                return EIO;
-        }
-        
-        /* Ensure the name length is not too large */
+        
+        // Ensure that the whole entry does not overflow the block
+        skip = ext2_directory_entry_ll_get_entry_length(it->current);
+        if (offset_in_block + skip > block_size) {
+                it->current = NULL;
+                return EIO;
+        }
+        
+        // Ensure the name length is not too large
         if (ext2_directory_entry_ll_get_name_length(it->fs->superblock, 
-            entry) > length-8) {
-                return EIO;
-        }
-        
-        it->current = entry;
+            it->current) > skip-8) {
+                it->current = NULL;
+                return EIO;
+        }
+        
         return EOK;
 }