Changeset 36bca8eb in mainline for uspace/app/ext2info/ext2info.c

Timestamp:

2011-02-13T18:55:00Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

e272949

Parents:

d5e2763

Message:

Add some more superblock members and function to read a superblock

File:

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

uspace/app/ext2info/ext2info.c

@@ -60 +60 @@
         char *dev_path;
         devmap_handle_t handle;
-        size_t block_size;
-        aoff64_t dev_nblocks;
-        uint8_t *data;
         ext2_superblock_t *superblock;
         
@@ -95 +92 @@
         }
 
-        rc = block_get_bsize(handle, &block_size);
-        if (rc != EOK) {
-                printf(NAME ": Error determining device block size.\n");
-                return 2;
-        }
-
-        rc = block_get_nblocks(handle, &dev_nblocks);
-        if (rc != EOK) {
-                printf(NAME ": Warning, failed to obtain block device size.\n");
-        }
-
-        data = malloc(block_size);
-        if (data == NULL) {
-                printf(NAME ": Error allocating data buffer of %" PRIuOFF64 " bytes", (aoff64_t) block_size);
-                block_fini(handle);
+        rc = ext2_superblock_read_direct(&superblock, handle);
+        if (rc != EOK)  {
+                printf(NAME ": Error reading superblock.\n");
                 return 3;
         }
-        
-        // TODO: don't assume device block size of 512 bytes
-        rc = block_read_direct(handle, 2, 1, data);
-        if (rc != EOK) {
-                printf(NAME ": Error reading block");
-                free(data);
-                return 3;
-        }
-        
-        superblock = (ext2_superblock_t *) data;
         
         printf("Superblock:\n");
@@ -133 +108 @@
         
         
-        free(data);
+        free(superblock);
 
         block_fini(handle);