sim: constify watchpoint interrupt names

GCC issues warnings because const strings like "foo" are passed as char*.
sim-watch.c: In function 'watchpoint_type_to_str':
sim-watch.c:120: warning: return discards qualifiers from pointer target type

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index fef7e74d10dbc9eee6f6c7da7ea2f6c7b35390e8..9153cb5fbd24875343b3f9f9fe791189bb314fe3 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-watch.c (watchpoint_type_to_str): Add const to return.
+       (interrupt_nr_to_str): Likewise.
+       (default_interrupt_names): Add const to pointer type.
+       (sim_watchpoint_install): Add const to prefix.
+       * sim-watch.h (struct _sim_watchpoints): Add const to interrupt_names.
+
 2010-03-30  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-core.c (sim_core_read_buffer): Change raddr to address_word.

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index df8e1b87146072851a751b696be7289384e3006d..17125afb9a53a0bcaa842fbee31b82335184a618 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -109,7 +109,7 @@ do_watchpoint_delete (SIM_DESC sd,
   return status;
 }
 
-static char *
+static const char *
 watchpoint_type_to_str (SIM_DESC sd,
                        watchpoint_type type)
 {
@@ -128,7 +128,7 @@ watchpoint_type_to_str (SIM_DESC sd,
   return NULL;
 }
 
-static char *
+static const char *
 interrupt_nr_to_str (SIM_DESC sd,
                     int interrupt_nr)
 {
@@ -381,7 +381,7 @@ static const OPTION watchpoint_options[] =
   { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL }
 };
 
-static char *default_interrupt_names[] = { "int", 0, };
+static const char *default_interrupt_names[] = { "int", 0, };
 
 
 
@@ -425,7 +425,7 @@ sim_watchpoint_install (SIM_DESC sd)
     /* adjust first few entries so that they contain real
        documentation, the first entry includes a list of actions. */
     {
-      char *prefix = 
+      const char *prefix =
        "Watch the simulator, take ACTION in COUNT cycles (`+' for every COUNT cycles), ACTION is";
       char *doc;
       int len = strlen (prefix) + 1;

diff --git a/sim/common/sim-watch.h b/sim/common/sim-watch.h
index 65be89fcf5d02d08015bffcd1785c5f67182cfd2..2945f8d91ba2f2969de3006f116bc1b92055b78e 100644 (file)
--- a/sim/common/sim-watch.h
+++ b/sim/common/sim-watch.h
@@ -63,7 +63,7 @@ typedef struct _sim_watchpoints {
   /* FIXME: can this be done better?  Look at the PPC's interrupt
      mechanism and table for a rough idea of where it will go next */
   int nr_interrupts;
-  char **interrupt_names;
+  const char **interrupt_names;
 
   /* active watchpoints */
   int last_point_nr;