Changeset aa85487 in mainline for kernel/generic/src/lib/elf.c

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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:

Merge mainline changes, revision 308

File:

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

kernel/generic/src/lib/elf.c

@@ -48 +48 @@
 #include <arch.h>
 
-static char *error_codes[] = {
+static const char *error_codes[] = {
         "no error",
         "invalid image",
@@ -137 +137 @@
  * @return NULL terminated description of error.
  */
-char *elf_error(unsigned int rc)
+const 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:
@@ -165 +163 @@
         case PT_DYNAMIC:
         case PT_INTERP:
-                interp = (char *)elf + entry->p_offset;
-                /* FIXME */
-                /*if (memcmp((uintptr_t)interp, (uintptr_t)ELF_INTERP_ZSTR,
+                // FIXME
+                /*
+                char *interp = (char *) elf + entry->p_offset;
+                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;