Changes in kernel/generic/src/lib/elf.c [137691a:439d036] in mainline

File:

• kernel/generic/src/lib/elf.c (modified) (4 diffs)

kernel/generic/src/lib/elf.c

@@ -48 +48 @@
 #include <arch.h>
 
-static const char *error_codes[] = {
+static char *error_codes[] = {
         "no error",
         "invalid image",
@@ -137 +137 @@
  * @return NULL terminated description of error.
  */
-const char *elf_error(unsigned int rc)
+char *elf_error(unsigned int rc)
 {
         ASSERT(rc < sizeof(error_codes) / sizeof(char *));
@@ -155 +155 @@
     as_t *as, int flags)
 {
+        char *interp;
+
         switch (entry->p_type) {
         case PT_NULL:
@@ -163 +165 @@
         case PT_DYNAMIC:
         case PT_INTERP:
-                // FIXME
-                /*
-                char *interp = (char *) elf + entry->p_offset;
-                if (memcmp((uintptr_t) interp, (uintptr_t) ELF_INTERP_ZSTR,
+                interp = (char *)elf + entry->p_offset;
+                /* FIXME */
+                /*if (memcmp((uintptr_t)interp, (uintptr_t)ELF_INTERP_ZSTR,
                     ELF_INTERP_ZLEN) != 0) {
                         return EE_UNSUPPORTED;
-                } */
+                }*/
                 if ((flags & ELD_F_LOADER) == 0) {
                         return EE_LOADER;