Changeset 3e828ea in mainline for uspace/srv/loader/main.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/srv/loader/main.c (modified) (1 diff)

uspace/srv/loader/main.c

@@ -290 +290 @@
         DPRINTF("LOADER_LOAD()\n");
 
-        int rc = elf_load(program_fd, &prog_info);
-        if (rc != EE_OK) {
+        errno_t rc = elf_load(program_fd, &prog_info);
+        if (rc != EOK) {
                 DPRINTF("Failed to load executable for '%s'.\n", progname);
                 async_answer_0(req, EINVAL);