diff options
| author | Haruna <haru@dotalux.com> | 2013-12-16 19:25:58 -0800 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2013-12-16 19:25:58 -0800 |
| commit | 8b84026c292fed6f6218278c870c4f8839fbd40a (patch) | |
| tree | 4b62aa52844a1916db1f18faba8b9cf29ff30810 /3rdparty/libconfig/extra/gen/scanner.l | |
| parent | 9e223137eba56dcd41bececf4360f321c9117247 (diff) | |
| parent | 3917562fc493c031bb20181b5d9ae6ab15ce9b76 (diff) | |
| download | hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.tar.gz hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.tar.bz2 hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.tar.xz hercules-8b84026c292fed6f6218278c870c4f8839fbd40a.zip | |
Merge pull request #237 from HerculesWS/warnings
This adds an Xcode project file (for those who develop on OS X) and fixes several - potential or real - issues we detected thanks to its more strict warnings settings. It also updates the unix build script with similar warning settings.
Diffstat (limited to '3rdparty/libconfig/extra/gen/scanner.l')
| -rw-r--r-- | 3rdparty/libconfig/extra/gen/scanner.l | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/3rdparty/libconfig/extra/gen/scanner.l b/3rdparty/libconfig/extra/gen/scanner.l index 4b3048fab..66364e019 100644 --- a/3rdparty/libconfig/extra/gen/scanner.l +++ b/3rdparty/libconfig/extra/gen/scanner.l @@ -86,6 +86,13 @@ static unsigned long long fromhex(const char *s) #endif /* __MINGW32__ */ } +static int fromihex(const char *s) { + unsigned long l = strtoul(s, NULL, 16); + if (l > INT32_MAX) + l = INT32_MAX; + return (int)l; +} + %} true [Tt][Rr][Uu][Ee] @@ -178,10 +185,7 @@ include_open ^[ \t]*@include[ \t]+\" {float} { yylval->fval = atof(yytext); return(TOK_FLOAT); } {integer} { yylval->ival = atoi(yytext); return(TOK_INTEGER); } {integer64} { yylval->llval = atoll(yytext); return(TOK_INTEGER64); } -{hex} { - yylval->ival = strtoul(yytext, NULL, 16); - return(TOK_HEX); - } +{hex} { yylval->ival = fromihex(yytext); return(TOK_HEX); } {hex64} { yylval->llval = fromhex(yytext); return(TOK_HEX64); } \[ { return(TOK_ARRAY_START); } \] { return(TOK_ARRAY_END); } |