Changeset 132ab5d1 in mainline for uspace/app/bdsh/cmds/modules/mkdir/mkdir.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/bdsh/cmds/modules/mkdir/mkdir.c (modified) (3 diffs)

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

@@ -94 +94 @@
 
         int ret = 0;
+        int rc;
 
         if (!create_parents) {
-                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (ret != EOK) {
+                rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(ret));
+                            cmdname, path, str_error(rc));
                         ret = 1;
                 }
@@ -135 +136 @@
                         path[prev_off] = 0;
 
-                        ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                        if (ret != EOK && ret != EEXIST) {
+                        rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                        if (rc != EOK && rc != EEXIST) {
                                 cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                                    cmdname, path, str_error(ret));
+                                    cmdname, path, str_error(rc));
                                 ret = 1;
                                 goto leave;
@@ -146 +147 @@
                 }
                 /* Create the final directory. */
-                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (ret != EOK) {
+                rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(ret));
+                            cmdname, path, str_error(rc));
                         ret = 1;
                 }