Changes in uspace/srv/loader/elf_load.c [08c9f7d5:a000878c] in mainline

File:

• uspace/srv/loader/elf_load.c (modified) (8 diffs)

uspace/srv/loader/elf_load.c

@@ -60 +60 @@
 #define DPRINTF(...)
 
-static char *error_codes[] = {
+static const char *error_codes[] = {
         "no error",
         "invalid image",
@@ -95 +95 @@
  * pointed to by @a info.
  *
- * @param file_name     Path to the ELF file.
- * @param so_bias       Bias to use if the file is a shared object.
- * @param info          Pointer to a structure for storing information
- *                      extracted from the binary.
+ * @param file_name Path to the ELF file.
+ * @param so_bias   Bias to use if the file is a shared object.
+ * @param info      Pointer to a structure for storing information
+ *                  extracted from the binary.
  *
  * @return EOK on success or negative error code.
- */
-int elf_load_file(char *file_name, size_t so_bias, elf_info_t *info)
+ *
+ */
+int elf_load_file(const char *file_name, size_t so_bias, elf_info_t *info)
 {
         elf_ld_t elf;
@@ -130 +131 @@
  * earlier with elf_load_file(). This function does not return.
  *
- * @param info  Info structure filled earlier by elf_load_file()
+ * @param info Info structure filled earlier by elf_load_file()
+ *
  */
 void elf_run(elf_info_t *info, pcb_t *pcb)
@@ -280 +282 @@
  * @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 *));
@@ -342 +344 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr,
-                entry->p_memsz);        
+        DPRINTF("Load segment at addr %p, size 0x%x\n", seg_addr,
+                entry->p_memsz);
 
         if (entry->p_align > 1) {
@@ -370 +372 @@
         mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
-        DPRINTF("Map to seg_addr=0x%x-0x%x.\n", seg_addr,
+        DPRINTF("Map to seg_addr=%p-%p.\n", seg_addr,
         entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
 
@@ -384 +386 @@
         }
 
-        DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n",
+        DPRINTF("as_area_create(%p, 0x%x, %d) -> 0x%lx\n",
                 base + bias, mem_sz, flags, (uintptr_t)a);
 
@@ -461 +463 @@
                 elf->info->dynamic =
                     (void *)((uint8_t *)entry->sh_addr + elf->bias);
-                DPRINTF("Dynamic section found at 0x%x.\n",
+                DPRINTF("Dynamic section found at %p.\n",
                         (uintptr_t)elf->info->dynamic);
                 break;