Changeset 056fa40 in mainline

Timestamp:

2009-09-03T15:57:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d044447

Parents:

e86a849a (diff), cffce57 (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 bdd command improvements.

File:

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

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

@@ -112 +112 @@
         while (size > 0) {
                 rc = block_get(&block, handle, boff, 0);
-                assert(rc == EOK);
+                if (rc != EOK) {
+                        printf("Error: could not get block %u, device %u.\n",
+                            boff, handle);
+                        return CMD_FAILURE;
+                }
                 blk = (uint8_t *) block->data;
 
@@ -142 +146 @@
 
                 rc = block_put(block);
-                assert(rc == EOK);
+                if (rc != EOK) {
+                        printf("Error: could not put block %p.\n",
+                            block);
+                        return CMD_FAILURE;
+                }
 
                 if (size > rows * BPR)