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

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

@@ -149 +149 @@
         }
 
-        fd = vfs_lookup(path, WALK_REGULAR);
-        if (fd >= 0) {
+        if (vfs_lookup(path, WALK_REGULAR, &fd) == EOK) {
                 vfs_put(fd);
                 return RM_FILE;
@@ -210 +209 @@
         rc = vfs_unlink_path(path);
         if (rc == EOK)
-                return EOK;
+                return 0;
 
         cli_error(CL_ENOTSUP, "Can not remove %s", path);