Changes in uspace/app/bdsh/cmds/modules/mkfile/mkfile.c [b7fd2a0:9af1c61] in mainline

File:

• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (5 diffs)

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

@@ -87 +87 @@
  * @param str   String containing the size specification.
  * @param rsize Place to store size in bytes
- * @return      EOK on success or an error code
+ * @return      EOK on success or error code
  */
-static errno_t read_size(const char *str, size_t *rsize)
+static int read_size(const char *str, size_t *rsize)
 {
         size_t number, unit;
@@ -123 +123 @@
         size_t to_write;
         size_t nwritten;
-        errno_t rc;
+        int rc;
         char *file_name;
         void *buffer;
@@ -163 +163 @@
         file_name = argv[optind];
 
-        rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE, &fd);
-        if (rc != EOK) {
+        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE);
+        if (fd < 0) {
                 printf("%s: failed to create file %s.\n", cmdname, file_name);
                 return CMD_FAILURE;
@@ -192 +192 @@
                 rc = vfs_write(fd, &pos, buffer, to_write, &nwritten);
                 if (rc != EOK) {
-                        printf("%s: Error writing file (%s).\n", cmdname, str_error(rc));
+                        printf("%s: Error writing file (%s).\n", cmdname, str_error(errno));
                         vfs_put(fd);
                         free(buffer);
@@ -202 +202 @@
         free(buffer);
 
-        rc = vfs_put(fd);
-        if (rc != EOK)
+        if (vfs_put(fd) < 0)
                 goto error;
 
         return CMD_SUCCESS;
 error:
-        printf("%s: Error writing file (%s).\n", cmdname, str_error(rc));
+        printf("%s: Error writing file (%s).\n", cmdname, str_error(errno));
         return CMD_FAILURE;
 }