From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16974 invoked by alias); 29 Mar 2010 21:49:40 -0000 Received: (qmail 16965 invoked by uid 22791); 29 Mar 2010 21:49:39 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 29 Mar 2010 21:49:33 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 9029A1B4049 for ; Mon, 29 Mar 2010 21:49:31 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: constify watchpoint interrupt names Date: Mon, 29 Mar 2010 21:49:00 -0000 Message-Id: <1269899363-10054-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg01026.txt.bz2 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 sim-watch.c:122: warning: return discards qualifiers from pointer target type sim-watch.c:124: warning: return discards qualifiers from pointer target type sim-watch.c:127: warning: return discards qualifiers from pointer target type sim-watch.c: In function 'interrupt_nr_to_str': sim-watch.c:138: warning: return discards qualifiers from pointer target type sim-watch.c:140: warning: return discards qualifiers from pointer target type sim-watch.c: At top level: sim-watch.c:385: warning: initialization discards qualifiers from pointer target type sim-watch.c: In function 'sim_watchpoint_install': sim-watch.c:430: warning: initialization discards qualifiers from pointer target type Signed-off-by: Mike Frysinger --- 2010-03-29 Mike Frysinger * 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. sim/common/sim-watch.c | 8 ++++---- sim/common/sim-watch.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c index df8e1b8..17125af 100644 --- 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 65be89f..2945f8d 100644 --- 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; -- 1.7.0.2