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

Timestamp:

2019-05-26T13:21:50Z (5 years ago)

Author:

Jakub Jermář <jakub@…>

Branches:

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

Children:

8aea932

Parents:

967e7a1

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-05-17 14:27:34)

git-committer:

Jakub Jermář <jakub@…> (2019-05-26 13:21:50)

Message:

Removing printf when failing from lib/rtld

If rtld failed a message was printed with printf.
This has been replaced with DPRINTF which
gives control to the developer over the message

File:

• uspace/lib/c/generic/elf/elf_load.c (modified) (3 diffs)

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

@@ -53 +53 @@
  * @param file File handle
  * @param info Place to store ELF program information
- * @return EE_OK on success or an EE_x error code
+ * @return EOK on success or an error code
  */
-int elf_load(int file, elf_info_t *info)
+errno_t elf_load(int file, elf_info_t *info)
 {
 #ifdef CONFIG_RTLD
         rtld_t *env;
 #endif
-        int rc;
+        errno_t rc;
 
         rc = elf_load_file(file, 0, &info->finfo);
-        if (rc != EE_OK) {
+        if (rc != EOK) {
                 DPRINTF("Failed to load executable '%s'.\n", file_name);
                 return rc;
@@ -72 +72 @@
                 DPRINTF("Binary is statically linked.\n");
                 info->env = NULL;
-                return EE_OK;
+                return EOK;
         }
 
@@ -79 +79 @@
         DPRINTF("- prog dynamic: %p\n", info->finfo.dynamic);
 
-        errno_t 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;
-        }
-
+        rc = rtld_prog_process(&info->finfo, &env);
         info->env = env;
 #else
-        rc = EE_UNSUPPORTED;
+        rc = ENOTSUP;
 #endif
         return rc;