Changeset 6a7e497 in mainline for uspace/lib/ext2/libext2_directory.c

Timestamp:

2011-06-02T19:05:17Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

16b2ea8

Parents:

18626b3 (diff), d030e0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with the original ext2 branch

File:

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

uspace/lib/ext2/libext2_directory.c

@@ -93 +93 @@
         it->fs = fs;
         
-        // Get the first data block, so we can get first entry
+        /* Get the first data block, so we can get the first entry */
         rc = ext2_filesystem_get_inode_data_block_index(fs, inode_ref->inode, 0, 
             &block_id);
@@ -133 +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);
@@ -150 +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);
@@ -176 +177 @@
         offset_in_block = (it->current_offset + skip) % block_size;
         
-        // Ensure proper alignment
+        /* Ensure proper alignment */
         if ((offset_in_block % 4) != 0) {
                 it->current = NULL;
@@ -182 +183 @@
         }
         
-        // Ensure that the core of the entry does not overflow the block
+        /* Ensure that the core of the entry does not overflow the block */
         if (offset_in_block > block_size - 8) {
                 it->current = NULL;
@@ -191 +192 @@
         it->current_offset += skip;
         
-        // Ensure that the whole entry does not overflow the 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) {
@@ -198 +199 @@
         }
         
-        // Ensure the name length is not too large
+        /* Ensure the name length is not too large */
         if (ext2_directory_entry_ll_get_name_length(it->fs->superblock, 
             it->current) > skip-8) {