Changeset cd5816d6 in mainline

Timestamp:

2011-02-12T14:20:25Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

d3842e0

Parents:

cfa73751

Message:

Fix displaying address and space delimiters in blkdump

File:

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

uspace/app/blkdump/blkdump.c

@@ -166 +166 @@
                 
                 for (data_offset = 0; data_offset < block_size; data_offset += 16) {
-                        printf("%8" PRIxOFF64 ": ", current+data_offset);
+                        printf("%8" PRIxOFF64 ": ", current*block_size + data_offset);
                         print_hex_row(data+data_offset, block_size-data_offset, 16);
                         printf("\n");
@@ -193 +193 @@
         // Print hexadecimal values
         for (pos = 0; pos < length; pos++) {
-                printf("%02hhX ", data[pos]);
                 if (pos == length/2) {
                         printf(" ");
                 }
+                printf("%02hhX ", data[pos]);
         }
         
         // pad with spaces if we have less than 16 bytes
         for (pos = length; pos < bytes_per_row; pos++) {
-                printf("   ");
                 if (pos == length/2) {
                         printf(" ");
                 }
+                printf("   ");
         }
         
         // Print printable characters
         for (pos = 0; pos < length; pos++) {
+                if (pos == length/2) {
+                        printf(" ");
+                }
                 b = data[pos];
                 if (b >= 32 && b < 128) {