Changeset ff4f073 in mainline for uspace/app/ext2info/ext2info.c

Timestamp:

2011-06-03T22:33:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

547c37a, 8d6c1f1

Parents:

5c96b2a (diff), 911ee54 (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 ext2 fixes from ​http://ho.st.dcs.fmph.uniba.sk/~mato/bzr/helenos-ext2.

File:

• uspace/app/ext2info/ext2info.c (modified) (2 diffs)

uspace/app/ext2info/ext2info.c

@@ -586 +586 @@
         ext2_directory_iterator_t it;
         size_t name_size;
+        uint32_t inode;
         
         printf("  Directory contents:\n");
@@ -600 +601 @@
                 printf("    ");
                 print_data(&it.current->name, name_size);
-                printf(" --> %u\n", it.current->inode);
+                
+                inode = ext2_directory_entry_ll_get_inode(it.current);
+                printf(" --> %u\n", inode);
                 
                 rc = ext2_directory_iterator_next(&it);