From patchwork Thu Feb 19 22:31:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Gaisler X-Patchwork-Id: 5184 Received: (qmail 8541 invoked by alias); 19 Feb 2015 22:32:28 -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 8223 invoked by uid 89); 19 Feb 2015 22:32:21 -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; Thu, 19 Feb 2015 22:32:20 +0000 X-Halon-ID: 27f20fd6-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:15 +0100 (CET) From: Jiri Gaisler To: gdb-patches@sourceware.org Cc: Jiri Gaisler Subject: [PATCH v2 09/22] sim/erc32: Removed type mismatch compiler warnings Date: Thu, 19 Feb 2015 23:31:27 +0100 Message-Id: <1424385100-15397-10-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 (batch, exec_cmd) save return value to avoid warnings. (batch) replace fgets() with getline(). --- sim/erc32/func.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sim/erc32/func.c b/sim/erc32/func.c index f1d5bd7..a715f0f 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -81,20 +81,23 @@ batch(sregs, fname) char *fname; { FILE *fp; - char lbuf[1024]; + char *lbuf = NULL; + size_t len = 0; + ssize_t tmp; if ((fp = fopen(fname, "r")) == NULL) { fprintf(stderr, "couldn't open batch file %s\n", fname); return (0); } while (!feof(fp)) { - lbuf[0] = 0; - fgets(lbuf, 1023, fp); - if ((strlen(lbuf) > 0) && (lbuf[strlen(lbuf) - 1] == '\n')) + tmp = getline(&lbuf, &len, fp); + if ((strlen(lbuf) > 0) && (lbuf[strlen(lbuf) - 1] == '\n')) { lbuf[strlen(lbuf) - 1] = 0; - printf("sis> %s\n", lbuf); - exec_cmd(sregs, lbuf); + printf("sis> %s\n", lbuf); + exec_cmd(sregs, lbuf); + } } + if (lbuf) free(lbuf); fclose(fp); return (1); } @@ -383,7 +386,7 @@ exec_cmd(sregs, cmd) { char *cmd1, *cmd2; int32 stat; - uint32 len, i, clen, j; + uint32 len, i, clen, j, tmp; static uint32 daddr = 0; char *cmdsave; @@ -555,7 +558,7 @@ exec_cmd(sregs, cmd) sim_halt(); } else if (strncmp(cmd1, "shell", clen) == 0) { if ((cmd1 = strtok(NULL, " \t\n\r")) != NULL) { - system(&cmdsave[clen]); + tmp = system(&cmdsave[clen]); } } else if (strncmp(cmd1, "step", clen) == 0) { stat = run_sim(sregs, 1, 1);