From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 66100 invoked by alias); 1 Mar 2015 21:10:55 -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 66044 invoked by uid 89); 1 Mar 2015 21:10:55 -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; Sun, 01 Mar 2015 21:10:53 +0000 X-Halon-ID: 6f4f413b-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:48 +0100 (CET) From: Jiri Gaisler To: gdb-patches@sourceware.org Cc: Jiri Gaisler Subject: [PATCH v3 02/14] sim/erc32: Removed type mismatch compiler warnings Date: Sun, 01 Mar 2015 21:10:00 -0000 Message-Id: <1425244244-27709-3-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/msg00009.txt.bz2 * func.c (exec_cmd) : silence compiler warnings when calling system(). (batch) : replace fgets() with getline(). --- sim/erc32/func.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sim/erc32/func.c b/sim/erc32/func.c index e324b57..e0037e7 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -81,20 +81,24 @@ 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')) + if (getline(&lbuf, &len, fp) == -1) + break; + 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); + } } + free(lbuf); fclose(fp); return (1); } @@ -383,7 +387,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 +559,9 @@ exec_cmd(sregs, cmd) sim_halt(); } else if (strncmp(cmd1, "shell", clen) == 0) { if ((cmd1 = strtok(NULL, " \t\n\r")) != NULL) { - system(&cmdsave[clen]); + if (system(&cmdsave[clen])) { + /* Silence unused return value warning. */ + } } } else if (strncmp(cmd1, "step", clen) == 0) { stat = run_sim(sregs, 1, 1); -- 1.9.1