Changeset 132ab5d1 in mainline for uspace/app/blkdump/blkdump.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/app/blkdump/blkdump.c (modified) (1 diff)

uspace/app/blkdump/blkdump.c

@@ -161 +161 @@
         printf("Device %s has %" PRIuOFF64 " blocks, %" PRIuOFF64 " bytes each\n", dev_path, dev_nblocks, (aoff64_t) block_size);
 
+        int ret;
         if (toc)
-                rc = print_toc();
+                ret = print_toc();
         else
-                rc = print_blocks(block_offset, block_count, block_size);
+                ret = print_blocks(block_offset, block_count, block_size);
 
         block_fini(service_id);
 
-        return rc;
+        return ret;
 }