From dd34b783cf2de271d7af9ec071df3493e53159db Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 6 Nov 2010 17:12:13 +0000 Subject: [PATCH] minor rewrite, a local variable type change --- ChangeLog | 4 ++++ src/frontend/parser/lexical.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5c17a7ac..6cc5e34c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-06 Robert Larice + * src/frontend/parser/lexical.c : + minor rewrite, a local variable type change + 2010-11-06 Robert Larice * src/frontend/evaluate.c : tiny rewrite to avoid "variable ... might be clobbered by 'longjmp'" warnings diff --git a/src/frontend/parser/lexical.c b/src/frontend/parser/lexical.c index 84d42fd53..66e005f4c 100644 --- a/src/frontend/parser/lexical.c +++ b/src/frontend/parser/lexical.c @@ -106,10 +106,10 @@ pwlist_echo( /*CDHW used to perform function of set echo */ wordlist * cp_lexer(char *string) { - int c; + int c, d; int i, j; wordlist *wlist = NULL, *cw = NULL; - char buf[NEW_BSIZE_SP], linebuf[NEW_BSIZE_SP], d; + char buf[NEW_BSIZE_SP], linebuf[NEW_BSIZE_SP]; int paren; if (cp_inp_cur == NULL) @@ -212,7 +212,7 @@ gotchar: case '"': case '`': d = c; - buf[i++] = d; + buf[i++] = (char) d; while (((c = (string ? *string++ : input(cp_inp_cur))) != d) && (i < NEW_BSIZE_SP - 2)) { if ((c == '\n') || (c == EOF) || (c == ESCAPE)) @@ -228,8 +228,8 @@ gotchar: linebuf[j++] = (char) c; } } - buf[i++] = d; - linebuf[j++] = d; + buf[i++] = (char) d; + linebuf[j++] = (char) d; break; case '\004':