hurd-l4/laden loader.c loader.h

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/15 14:14:07

Modified files:
        laden          : loader.c loader.h 

Log message:
        Merge changes from wortel version.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/loader.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/loader.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd-l4/laden/loader.c
diff -u hurd-l4/laden/loader.c:1.6 hurd-l4/laden/loader.c:1.7
--- hurd-l4/laden/loader.c:1.6  Mon Sep  8 10:23:17 2003
+++ hurd-l4/laden/loader.c      Mon Sep 15 14:14:07 2003
@@ -82,7 +82,7 @@
 
 static struct
 {
-  char *name;
+  const char *name;
   l4_word_t start;
   l4_word_t end;
 } used_regions[MAX_REGIONS];
@@ -93,7 +93,7 @@
 /* Check that the region with the name NAME from START to END does not
    overlap with an existing region.  */
 static void
-check_region (char *name, l4_word_t start, l4_word_t end)
+check_region (const char *name, l4_word_t start, l4_word_t end)
 {
   int i;
 
@@ -115,7 +115,7 @@
    regions to check against.  Before doing that, check for overlaps
    with existing regions.  */
 void
-loader_add_region (char *name, l4_word_t start, l4_word_t end)
+loader_add_region (const char *name, l4_word_t start, l4_word_t end)
 {
   debug ("Protected Region: %s (0x%x - 0x%x)\n", name, start, end);
 
@@ -142,7 +142,7 @@
       break;
 
   if (i == nr_regions)
-    panic ("Assertion failure: Could not find region %s for removal");
+    panic ("Assertion failure: Could not find region %s for removal", name);
 
   while (i < nr_regions - 1)
     {
@@ -159,7 +159,7 @@
    program in NEW_START_P and NEW_END_P, and the entry point in
    ENTRY.  */
 void
-loader_elf_load (char *name, l4_word_t start, l4_word_t end,
+loader_elf_load (const char *name, l4_word_t start, l4_word_t end,
                 l4_word_t *new_start_p, l4_word_t *new_end_p,
                 l4_word_t *entry)
 {
Index: hurd-l4/laden/loader.h
diff -u hurd-l4/laden/loader.h:1.1 hurd-l4/laden/loader.h:1.2
--- hurd-l4/laden/loader.h:1.1  Mon Sep  8 10:23:17 2003
+++ hurd-l4/laden/loader.h      Mon Sep 15 14:14:07 2003
@@ -38,7 +38,7 @@
 /* Add the region with the name NAME from START to END to the table of
    regions to check against.  Before doing that, check for overlaps
    with existing regions.  */
-void loader_add_region (char *name, l4_word_t start, l4_word_t end);
+void loader_add_region (const char *name, l4_word_t start, l4_word_t end);
 
 /* Remove the region with the name NAME from the table.  */
 void loader_remove_region (const char *name);
@@ -48,7 +48,7 @@
    program).  Return the lowest and highest address used by the
    program in NEW_START_P and NEW_END_P, and the entry point in
    ENTRY.  */
-void loader_elf_load (char *name, l4_word_t start, l4_word_t end,
+void loader_elf_load (const char *name, l4_word_t start, l4_word_t end,
                      l4_word_t *new_start_p, l4_word_t *new_end_p,
                      l4_word_t *entry);