Changes in uspace/lib/c/generic/elf/elf_mod.c [a53ed3a:8e3498b] in mainline

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (11 diffs)

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

@@ -69 +69 @@
         "incompatible image",
         "unsupported image type",
-        "irrecoverable error",
-        "file io error"
+        "irrecoverable error"
 };
 
@@ -91 +90 @@
  *                  extracted from the binary.
  *
- * @return EE_OK on success or EE_xx error code.
+ * @return EOK on success or negative error code.
  *
  */
@@ -98 +97 @@
         elf_ld_t elf;
 
-        int ofile;
-        errno_t rc = vfs_clone(file, -1, true, &ofile);
-        if (rc == EOK) {
-                rc = vfs_open(ofile, MODE_READ);
-        }
+        int ofile = vfs_clone(file, -1, true);
+        int rc = vfs_open(ofile, MODE_READ);
         if (rc != EOK) {
-                return EE_IO;
+                return rc;
         }
 
@@ -111 +107 @@
         elf.flags = flags;
 
-        int ret = elf_load_module(&elf, so_bias);
+        rc = elf_load_module(&elf, so_bias);
 
         vfs_put(ofile);
-        return ret;
+        return rc;
 }
 
@@ -120 +116 @@
     elf_finfo_t *info)
 {
-        int file;
-        errno_t rc = vfs_lookup(path, 0, &file);
-        if (rc == EOK) {
-                int ret = elf_load_file(file, so_bias, flags, info);
-                vfs_put(file);
-                return ret;
-        } else {
-                return EE_IO;
-        }
+        int file = vfs_lookup(path, 0);
+        int rc = elf_load_file(file, so_bias, flags, info);
+        vfs_put(file);
+        return rc;
 }
 
@@ -147 +138 @@
         aoff64_t pos = 0;
         size_t nr;
-        int i, ret;
-        errno_t rc;
+        int i, rc;
 
         rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t), &nr);
         if (rc != EOK || nr != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
-                return EE_IO;
+                return EE_INVALID;
         }
 
@@ -213 +203 @@
                 if (rc != EOK || nr != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
-                        return EE_IO;
+                        return EE_INVALID;
                 }
 
-                ret = segment_header(elf, &segment_hdr);
-                if (ret != EE_OK)
-                        return ret;
+                rc = segment_header(elf, &segment_hdr);
+                if (rc != EE_OK)
+                        return rc;
         }
 
@@ -232 +222 @@
                 if (rc != EOK || nr != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
-                        return EE_IO;
+                        return EE_INVALID;
                 }
 
-                ret = section_header(elf, &section_hdr);
-                if (ret != EE_OK)
-                        return ret;
+                rc = section_header(elf, &section_hdr);
+                if (rc != EE_OK)
+                        return rc;
         }
 
@@ -341 +331 @@
         size_t mem_sz;
         aoff64_t pos;
-        errno_t rc;
+        int rc;
         size_t nr;
 
@@ -403 +393 @@
         if (rc != EOK || nr != entry->p_filesz) {
                 DPRINTF("read error\n");
-                return EE_IO;
+                return EE_INVALID;
         }
 
@@ -414 +404 @@
 //      printf("set area flags to %d\n", flags);
         rc = as_area_change_flags(seg_ptr, flags);
-        if (rc != EOK) {
+        if (rc != 0) {
                 DPRINTF("Failed to set memory area flags.\n");
                 return EE_MEMORY;