Changeset ba519f7 in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2010-12-02T17:21:30Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3bd76491

Parents:

8ad673a (diff), 41a7f62 (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 from mainline

Location:

uspace/app/bdsh/cmds/modules

Files:

• bdd/bdd.c (modified) (2 diffs)
• cp/cp.c (modified) (4 diffs)
• mkfile/mkfile.c (modified) (2 diffs)
• unmount/unmount.c (modified) (2 diffs)

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

@@ -30 +30 @@
 #include <stdlib.h>
 #include <str.h>
+#include <sys/typefmt.h>
 #include "config.h"
 #include "util.h"
@@ -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);

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

@@ -95 +95 @@
 
         if (vb)
-                printf("%d bytes to copy\n", total);
+                printf("%" PRIu64 " bytes to copy\n", total);
 
         lseek(fd1, 0, SEEK_SET);
@@ -130 +130 @@
                  */
                 if (res != 0) {
-                        printf("\n%d more bytes than actually exist were copied\n", res);
+                        printf("\n%zd more bytes than actually exist were copied\n", res);
                         goto err;
                 }
@@ -187 +187 @@
                         return CMD_SUCCESS;
                 case 'v':
-                        printf("%d\n", CP_VERSION);
+                        printf("%s\n", CP_VERSION);
                         return CMD_SUCCESS;
                 case 'V':
@@ -223 +223 @@
 
         if (verbose)
-                printf("%d bytes copied\n", ret);
+                printf("%" PRId64 " bytes copied\n", ret);
 
         if (ret >= 0)

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

@@ -168 +168 @@
                 rc = write(fd, buffer, to_write);
                 if (rc <= 0) {
-                        printf("%s: Error writing file (%d).\n", cmdname, rc);
+                        printf("%s: Error writing file (%zd).\n", cmdname, rc);
                         close(fd);
                         return CMD_FAILURE;
@@ -177 +177 @@
         rc = close(fd);
         if (rc != 0) {
-                printf("%s: Error writing file (%d).\n", cmdname, rc);
+                printf("%s: Error writing file (%zd).\n", cmdname, rc);
                 return CMD_FAILURE;
         }

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

@@ -47 +47 @@
         } else {
                 help_cmd_unmount(HELP_SHORT);
-                printf("Usage:  %s <mp>\n", cmdname);
+                printf("Usage: %s <mp>\n", cmdname);
         }
         return;
@@ -68 +68 @@
         rc = unmount(argv[1]);
         if (rc != EOK) {
-                printf("Unable to unmount %s (rc=%d)\n", argv[1]);
+                printf("Unable to unmount %s (rc=%d)\n", argv[1], rc);
                 return CMD_FAILURE;
         }