Changeset 46c20c8 in mainline for uspace/app/bdsh/cmds/modules/bdd/bdd.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 mainline changes.

File:

• uspace/app/bdsh/cmds/modules/bdd/bdd.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
+#include <sys/typefmt.h>
 #include "config.h"
 #include "util.h"
@@ -68 +69 @@
         unsigned int argc;
         unsigned int i, j;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         uint8_t *blk;
         size_t size, bytes, rows;
         size_t block_size;
         int rc;
-        bn_t ba;
+        aoff64_t ba;
         uint8_t b;
 
@@ -122 +123 @@
                 rc = block_read_direct(handle, ba, 1, blk);
                 if (rc != EOK) {
-                        printf("%s: Error reading block %llu\n", cmdname, ba);
+                        printf("%s: Error reading block %" PRIuOFF64 "\n", cmdname, ba);
                         free(blk);
                         block_fini(handle);