Changeset 8bd5dad in mainline for uspace/app/ext2info/ext2info.c

Timestamp:

2011-02-13T21:20:21Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

c00e729

Parents:

566c401

Message:

Initialize libext2 in ext2info & fixed some bugs in libext2

File:

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

uspace/app/ext2info/ext2info.c

@@ -60 +60 @@
         char *dev_path;
         devmap_handle_t handle;
-        ext2_superblock_t *superblock;
+        ext2_filesystem_t filesystem;
         
         uint16_t magic;
@@ -86 +86 @@
         }
 
-        rc = block_init(handle, 2048);
+        rc = ext2_filesystem_init(&filesystem, handle);
         if (rc != EOK)  {
-                printf(NAME ": Error initializing libblock.\n");
-                return 2;
-        }
-
-        rc = ext2_superblock_read_direct(handle, &superblock);
-        if (rc != EOK)  {
-                printf(NAME ": Error reading superblock.\n");
+                printf(NAME ": Error initializing libext2.\n");
                 return 3;
         }
         
         printf("Superblock:\n");
-        magic = ext2_superblock_get_magic(superblock);
+        magic = ext2_superblock_get_magic(filesystem.superblock);
         if (magic == EXT2_SUPERBLOCK_MAGIC) {
                 printf("  Magic value: %X (correct)\n", magic);
@@ -106 +100 @@
                 printf("  Magic value: %X (incorrect)\n", magic);
         }
-        
-        
-        free(superblock);
 
-        block_fini(handle);
+        ext2_filesystem_fini(&filesystem);
 
         return 0;