From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 66819 invoked by alias); 1 Mar 2015 21:10:59 -0000 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 Received: (qmail 66685 invoked by uid 89); 1 Mar 2015 21:10:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: bin-vsp-out-02.atm.binero.net Received: from vsp-authed01.binero.net (HELO bin-vsp-out-02.atm.binero.net) (195.74.38.224) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 01 Mar 2015 21:10:57 +0000 X-Halon-ID: 7190427a-c057-11e4-891e-005056917f90 Authorized-sender: jiri@gaisler.se Received: from decibel.local (unknown [78.68.173.120]) by bin-vsp-out-02.atm.binero.net (Halon Mail Gateway) with ESMTPSA; Sun, 1 Mar 2015 22:10:52 +0100 (CET) From: Jiri Gaisler To: gdb-patches@sourceware.org Cc: Jiri Gaisler Subject: [PATCH v3 06/14] sim/erc32: Fix a few compiler warnings Date: Sun, 01 Mar 2015 21:10:00 -0000 Message-Id: <1425244244-27709-7-git-send-email-jiri@gaisler.se> In-Reply-To: <1425244244-27709-1-git-send-email-jiri@gaisler.se> References: <1425244244-27709-1-git-send-email-jiri@gaisler.se> X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00013.txt.bz2 * func.c Minor edits to remove compiler warnings. * func.c, sis.h (exec_cmd) make second argument const char. --- sim/erc32/func.c | 9 ++++++--- sim/erc32/sis.h | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sim/erc32/func.c b/sim/erc32/func.c index 69d11fe..82c0deb 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -381,18 +381,19 @@ limcalc (freq) int exec_cmd(sregs, cmd) - char *cmd; + const char *cmd; struct pstate *sregs; { char *cmd1, *cmd2; int32 stat; uint32 len, i, clen, j, tmp; static uint32 daddr = 0; - char *cmdsave; + char *cmdsave, *cmdsave2 = NULL; stat = OK; cmdsave = strdup(cmd); - if ((cmd1 = strtok(cmd, " \t")) != NULL) { + cmdsave2 = strdup(cmd); + if ((cmd1 = strtok(cmdsave2, " \t")) != NULL) { clen = strlen(cmd1); if (strncmp(cmd1, "bp", clen) == 0) { for (i = 0; i < sregs->bptnum; i++) { @@ -609,6 +610,8 @@ exec_cmd(sregs, cmd) } else printf("syntax error\n"); } + if (cmdsave2 != NULL) + free(cmdsave2); if (cmdsave != NULL) free(cmdsave); return (stat); diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h index 95c7858..742d2d8 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -184,7 +184,7 @@ extern struct pstate sregs; extern void set_regi (struct pstate *sregs, int32 reg, uint32 rval); extern void get_regi (struct pstate *sregs, int32 reg, char *buf); -extern int exec_cmd (struct pstate *sregs, char *cmd); +extern int exec_cmd (struct pstate *sregs, const char *cmd); extern void reset_stat (struct pstate *sregs); extern void show_stat (struct pstate *sregs); extern void init_bpt (struct pstate *sregs); @@ -202,7 +202,6 @@ extern int check_bpt (struct pstate *sregs); extern void reset_all (void); extern void sys_reset (void); extern void sys_halt (void); -extern int bfd_load (char *fname); extern double get_time (void); /* exec.c */ -- 1.9.1