Changeset 46c20c8 in mainline for uspace/app/bdsh/cmds/modules/mkfile/mkfile.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/mkfile/mkfile.c (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 
@@ -51 +51 @@
 #define BUFFER_SIZE 16384
 
-static char *cmdname = "mkfile";
+static const char *cmdname = "mkfile";
 
 static struct option const long_options[] = {
@@ -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;
         }