From patchwork Thu Feb 19 22:31:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Gaisler X-Patchwork-Id: 5186 Received: (qmail 8630 invoked by alias); 19 Feb 2015 22:32:29 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8314 invoked by uid 89); 19 Feb 2015 22:32:27 -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-unauthed01.binero.net (HELO bin-vsp-out-02.atm.binero.net) (195.74.38.225) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 19 Feb 2015 22:32:24 +0000 X-Halon-ID: 2a2a50a7-b887-11e4-891e-005056917f90 Authorized-sender: jiri@gaisler.se Received: from localhost.localdomain (unknown [78.68.173.120]) by bin-vsp-out-02.atm.binero.net (Halon Mail Gateway) with ESMTPSA; Thu, 19 Feb 2015 23:32:19 +0100 (CET) From: Jiri Gaisler To: gdb-patches@sourceware.org Cc: Jiri Gaisler Subject: [PATCH v2 13/22] sim/erc32: Fix a few compiler warnings Date: Thu, 19 Feb 2015 23:31:31 +0100 Message-Id: <1424385100-15397-14-git-send-email-jiri@gaisler.se> In-Reply-To: <1424385100-15397-1-git-send-email-jiri@gaisler.se> References: <1424385100-15397-1-git-send-email-jiri@gaisler.se> X-IsSubscribed: yes * 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 ab21e3c..70b42c9 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -380,18 +380,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++) { @@ -606,6 +607,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 fb733de..4ecf885 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -191,7 +191,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); @@ -209,7 +209,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 */