Changeset a000878c in mainline for uspace/srv/loader

Timestamp:

2010-02-25T19:11:25Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

958de16

Parents:

a634485

Message:

make sure that all statically allocated strings are declared as "const char *"
and are treated as read-only

Location:

uspace/srv/loader

Files:

• elf_load.c (modified) (4 diffs)
• include/elf.h (modified) (1 diff)
• include/elf_load.h (modified) (3 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 *));

uspace/srv/loader/include/elf.h

@@ -337 +337 @@
 #endif
 
-extern char *elf_error(unsigned int rc);
+extern const char *elf_error(unsigned int rc);
 
 #endif

uspace/srv/loader/include/elf_load.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -51 +51 @@
 
         /** ELF interpreter name or NULL if statically-linked */
-        char *interp;
+        const char *interp;
 
         /** Pointer to the dynamic section */
@@ -74 +74 @@
 } elf_ld_t;
 
-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);
 void elf_run(elf_info_t *info, pcb_t *pcb);
 void elf_create_pcb(elf_info_t *info, pcb_t *pcb);