Changes in kernel/generic/src/proc/program.c [d1e8440:e190e640] in mainline

File:

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

kernel/generic/src/proc/program.c

@@ -49 +49 @@
 #include <lib/elf_load.h>
 #include <errno.h>
-#include <print.h>
+#include <log.h>
 #include <syscall/copy.h>
 #include <proc/program.h>
@@ -91 +91 @@
         if (!area) {
                 task_destroy(prg->task);
+                prg->task = NULL;
                 return ENOMEM;
         }
@@ -113 +114 @@
                 as_area_destroy(as, virt);
                 task_destroy(prg->task);
+                prg->task = NULL;
                 return ELIMIT;
         }
@@ -155 +157 @@
                 
                 program_loader = image_addr;
-                printf("Program loader at %p\n", (void *) image_addr);
+                log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr);
                 
                 return EOK;
@@ -181 +183 @@
         if (!loader) {
                 as_destroy(as);
-                printf("Cannot spawn loader as none was registered\n");
+                log(LF_OTHER, LVL_ERROR,
+                    "Cannot spawn loader as none was registered");
                 return ENOENT;
         }
@@ -189 +192 @@
         if (prg->loader_status != EE_OK) {
                 as_destroy(as);
-                printf("Cannot spawn loader (%s)\n",
+                log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
                     elf_error(prg->loader_status));
                 return ENOENT;