Changeset 3bacee1 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (5 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -273 +273 @@
                 // FIXME: This actually won't work, because the text segment is
                 // not loaded yet.
-                #if 0
+#if 0
                 if (elf->info->interp[entry->p_filesz - 1] != '\0') {
                         DPRINTF("Unterminated ELF interp string.\n");
@@ -279 +279 @@
                 }
                 DPRINTF("interpreter: \"%s\"\n", elf->info->interp);
-                #endif
+#endif
                 break;
         case PT_DYNAMIC:
@@ -286 +286 @@
                     (void *)((uint8_t *)entry->p_vaddr + elf->bias);
                 DPRINTF("dynamic section found at %p\n",
-                        (void *)elf->info->dynamic);
+                    (void *)elf->info->dynamic);
                 break;
         case 0x70000000:
@@ -334 +334 @@
 
         DPRINTF("Load segment at addr %p, size 0x%zx\n", (void *) seg_addr,
-                entry->p_memsz);
+            entry->p_memsz);
 
         if (entry->p_align > 1) {
@@ -394 +394 @@
          * need to set the right access mode and ensure SMC coherence.
          */
-        if ((elf->flags & ELDF_RW) != 0) return EE_OK;
+        if ((elf->flags & ELDF_RW) != 0)
+                return EE_OK;
 
 //      printf("set area flags to %d\n", flags);