Changes in uspace/app/blkdump/blkdump.c [7901ac8:15f3c3f] in mainline

File:

• uspace/app/blkdump/blkdump.c (modified) (10 diffs)

uspace/app/blkdump/blkdump.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Martin Sucha
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <block.h>
+#include <libblock.h>
 #include <mem.h>
 #include <loc.h>
@@ -52 +52 @@
 
 static void syntax_print(void);
-static int print_blocks(aoff64_t block_offset, aoff64_t block_count, size_t block_size);
-static int print_toc(void);
 static void print_hex_row(uint8_t *data, size_t length, size_t bytes_per_row);
-
-static bool relative = false;
-static service_id_t service_id;
 
 int main(int argc, char **argv)
@@ -64 +59 @@
         int rc;
         char *dev_path;
+        service_id_t service_id;
         size_t block_size;
         char *endptr;
@@ -69 +65 @@
         aoff64_t block_count = 1;
         aoff64_t dev_nblocks;
-        bool toc = false;
+        uint8_t *data;
+        size_t data_offset;
+        aoff64_t current;
+        aoff64_t limit;
+        bool relative = false;
         
         if (argc < 2) {
@@ -79 +79 @@
         --argc; ++argv;
 
-        if (str_cmp(*argv, "--toc") == 0) {
-                --argc; ++argv;
-                toc = true;
-                goto devname;
-        }
-
         if (str_cmp(*argv, "--relative") == 0) {
                 --argc; ++argv;
@@ -126 +120 @@
         }
 
-devname:
         if (argc != 1) {
                 printf(NAME ": Error, unexpected argument.\n");
@@ -160 +153 @@
         printf("Device %s has %" PRIuOFF64 " blocks, %" PRIuOFF64 " bytes each\n", dev_path, dev_nblocks, (aoff64_t) block_size);
 
-        if (toc)
-                rc = print_toc();
-        else
-                rc = print_blocks(block_offset, block_count, block_size);
-
-        block_fini(service_id);
-
-        return rc;
-}
-
-static int print_blocks(aoff64_t block_offset, aoff64_t block_count, size_t block_size)
-{
-        uint8_t *data;
-        aoff64_t current;
-        aoff64_t limit;
-        size_t data_offset;
-        int rc;
-
         data = malloc(block_size);
         if (data == NULL) {
                 printf(NAME ": Error allocating data buffer of %" PRIuOFF64 " bytes", (aoff64_t) block_size);
+                block_fini(service_id);
                 return 3;
         }
-
+        
         limit = block_offset + block_count;
         for (current = block_offset; current < limit; current++) {
@@ -192 +168 @@
                         return 3;
                 }
-
+                
                 printf("---- Block %" PRIuOFF64 " (at %" PRIuOFF64 ") ----\n", current, current*block_size);
-
+                
                 for (data_offset = 0; data_offset < block_size; data_offset += 16) {
                         if (relative) {
@@ -207 +183 @@
                 printf("\n");
         }
-
+        
         free(data);
-        return 0;
-}
-
-static int print_toc(void)
-{
-        toc_block_t *toc;
-
-        toc = block_get_toc(service_id, 0);
-        if (toc == NULL)
-                return 1;
-
-        printf("TOC size: %" PRIu16 " bytes\n", toc->size);
-        printf("First session: %" PRIu8 "\n", toc->first_session);
-        printf("Last_session: %" PRIu8 "\n", toc->last_session);
+
+        block_fini(service_id);
 
         return 0;