Changeset bc73be3 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/proc/program.c (modified) (4 diffs)

kernel/generic/src/proc/program.c

@@ -48 +48 @@
 #include <security/perm.h>
 #include <lib/elf_load.h>
-#include <errno.h>
+#include <str.h>
 #include <log.h>
 #include <syscall/copy.h>
@@ -76 +76 @@
                 return ENOMEM;
 
-        prg->loader_status = EE_OK;
+        prg->loader_status = EOK;
         prg->task = task_create(as, name);
         if (!prg->task) {
@@ -149 +149 @@
 
         prg->loader_status = elf_load((elf_header_t *) image_addr, as);
-        if (prg->loader_status != EE_OK) {
+        if (prg->loader_status != EOK) {
                 as_release(as);
                 prg->task = NULL;
@@ -183 +183 @@
 
         prg->loader_status = elf_load((elf_header_t *) program_loader, as);
-        if (prg->loader_status != EE_OK) {
+        if (prg->loader_status != EOK) {
                 as_release(as);
                 log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
-                    elf_error(prg->loader_status));
+                    str_error(prg->loader_status));
                 return ENOENT;
         }