Changeset f77c1c9 in mainline for uspace/app/sysinst/futil.c

Timestamp:

2017-12-08T21:03:35Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c19a5a59

Parents:

c1694b6b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 19:44:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Return VFS handles separately from error codes.

File:

• uspace/app/sysinst/futil.c (modified) (3 diffs)

uspace/app/sysinst/futil.c

@@ -63 +63 @@
         printf("Copy '%s' to '%s'.\n", srcp, destp);
 
-        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
-        if (sf < 0)
-                return EIO;
-
-        df = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
-        if (df < 0)
+        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
+        if (rc != EOK)
+                return EIO;
+
+        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &df);
+        if (rc != EOK)
                 return EIO;
 
@@ -87 +87 @@
 
         rc = vfs_put(df);
-        if (rc < 0)
+        if (rc != EOK)
                 return EIO;
 
@@ -167 +167 @@
         struct stat st;
 
-        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
-        if (sf < 0)
+        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
+        if (rc != EOK)
                 return ENOENT;