Changeset 95afd72 in mainline

Timestamp:

2011-06-03T21:51:10Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

911ee54

Parents:

d7c3367

Message:

Refactor checks in ext2_directory_iterator_next into a separate function

File:

• uspace/lib/ext2/libext2_directory.c (modified) (5 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
@@ -126 +129 @@
         uint32_t next_block_phys_idx;
         uint32_t block_size;
-        uint32_t offset_in_block;
         
         assert(it->current != NULL);
@@ -175 +177 @@
         }
         
-        offset_in_block = (it->current_offset + skip) % block_size;
+        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) {
-                it->current = NULL;
                 return EIO;
         }
@@ -185 +196 @@
         /* 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 EIO;
+        }
+        
+        ext2_directory_entry_ll_t *entry = it->current_block->data + offset_in_block;
         
         /* 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;
+        uint16_t length = ext2_directory_entry_ll_get_entry_length(entry);
+        if (offset_in_block + length > block_size) {
                 return EIO;
         }
@@ -201 +209 @@
         /* Ensure the name length is not too large */
         if (ext2_directory_entry_ll_get_name_length(it->fs->superblock, 
-            it->current) > skip-8) {
-                it->current = NULL;
-                return EIO;
-        }
-        
+            entry) > length-8) {
+                return EIO;
+        }
+        
+        it->current = entry;
         return EOK;
 }