Changeset 132ab5d1 in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2018-01-30T03:20:45Z (7 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/lib/c/generic/elf/elf_load.c (modified) (2 diffs)

uspace/lib/c/generic/elf/elf_load.c

@@ -53 +53 @@
  * @param file File handle 
  * @param info Place to store ELF program information
- * @return EOK on success or non-zero error code
+ * @return EE_OK on success or an EE_x error code
  */
 int elf_load(int file, elf_info_t *info)
@@ -79 +79 @@
         DPRINTF( "- prog dynamic: %p\n", info->finfo.dynamic);
 
-        rc = rtld_prog_process(&info->finfo, &env);
+        int rc2 = rtld_prog_process(&info->finfo, &env);
+        switch (rc2) {
+        case EOK:
+                rc = EE_OK;
+                break;
+        case ENOMEM:
+                rc = EE_MEMORY;
+                break;
+        default:
+                DPRINTF("Unexpected error code from rtld_prog_process(): %s\n", str_error_name(rc2));
+                rc = EE_INVALID;
+        }
+
         info->env = env;
 #else