Changeset f77c1c9 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2017-12-08T21:03:35Z (8 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/lib/c/generic/elf/elf_mod.c (modified) (2 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -97 +97 @@
         elf_ld_t elf;
 
-        int ofile = vfs_clone(file, -1, true);
-        int rc = vfs_open(ofile, MODE_READ);
+        int ofile;
+        int rc = vfs_clone(file, -1, true, &ofile);
+        if (rc == EOK) {
+                rc = vfs_open(ofile, MODE_READ);
+        }
         if (rc != EOK) {
                 return rc;
@@ -116 +119 @@
     elf_finfo_t *info)
 {
-        int file = vfs_lookup(path, 0);
-        int rc = elf_load_file(file, so_bias, flags, info);
-        vfs_put(file);
+        int file;
+        int rc = vfs_lookup(path, 0, &file);
+        if (rc == EOK) {
+                rc = elf_load_file(file, so_bias, flags, info);
+                vfs_put(file);
+        }
         return rc;
 }