From e1d2f50e472c783b8b5b59305b29719e11b1948c Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 12 Mar 2013 19:55:18 +0900 Subject: Remove a meaningless type cast. --- src/parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/parse.y b/src/parse.y index 62393a0bb..8553738e8 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3415,7 +3415,7 @@ scan_hex(const int *start, int len, int *retlen) register unsigned long retval = 0; char *tmp; - while (len-- && *s && (tmp = (char *)strchr(hexdigit, *s))) { + while (len-- && *s && (tmp = strchr(hexdigit, *s))) { retval <<= 4; retval |= (tmp - hexdigit) & 15; s++; -- cgit v1.2.3 From 2c54cf2e591053a47087a1da5ba53a22a4097322 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 12 Mar 2013 19:59:12 +0900 Subject: Add comments for paradnoid (a.k.a. mission critical) engineers. --- src/parse.y | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/parse.y b/src/parse.y index 8553738e8..33b2d5272 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3399,11 +3399,14 @@ scan_oct(const int *start, int len, int *retlen) const int *s = start; unsigned long retval = 0; + /* PARANOID: assert(len <= 3) */ + while (len-- && *s >= '0' && *s <= '7') { retval <<= 3; retval |= *s++ - '0'; } *retlen = s - start; + return retval; } @@ -3415,12 +3418,15 @@ scan_hex(const int *start, int len, int *retlen) register unsigned long retval = 0; char *tmp; + /* PARANOID: assert(len <= 2) */ + while (len-- && *s && (tmp = strchr(hexdigit, *s))) { retval <<= 4; retval |= (tmp - hexdigit) & 15; s++; } *retlen = s - start; + return retval; } -- cgit v1.2.3 From dd29e05f8eafa7943ff56341622f55bb127c486d Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 12 Mar 2013 20:00:48 +0900 Subject: Use int. They are no need to use unsigned/signed long. Think about 16bit architectures. --- src/parse.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/parse.y b/src/parse.y index 33b2d5272..d3e1ce8b9 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3393,11 +3393,11 @@ toklen(parser_state *p) #define IS_LABEL_POSSIBLE() ((p->lstate == EXPR_BEG && !cmd_state) || IS_ARG()) #define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1)) -static unsigned long +static int scan_oct(const int *start, int len, int *retlen) { const int *s = start; - unsigned long retval = 0; + int retval = 0; /* PARANOID: assert(len <= 3) */ @@ -3410,12 +3410,12 @@ scan_oct(const int *start, int len, int *retlen) return retval; } -static unsigned long +static int scan_hex(const int *start, int len, int *retlen) { static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF"; register const int *s = start; - register unsigned long retval = 0; + register int retval = 0; char *tmp; /* PARANOID: assert(len <= 2) */ -- cgit v1.2.3