Changeset 7715994 in mainline for uspace/srv/loader/elf_load.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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.

File:

• uspace/srv/loader/elf_load.c (modified) (4 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 *));