Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2015-02-22 23:08:56 +01:00
commit 906008d467

View File

@ -199,7 +199,7 @@ static StrScanFmt strscan_dec(const uint8_t *p, TValue *o,
*xip++ = d + ((*p != '.' ? *p : *++p) & 15); p++; *xip++ = d + ((*p != '.' ? *p : *++p) & 15); p++;
} }
/* Scan and realign trailing digit. */ /* Scan and realign trailing digit. */
if (i) *xip++ = 10 * ((*p != '.' ? *p : *++p) & 15), ex10--, p++; if (i) *xip++ = 10 * ((*p != '.' ? *p : *++p) & 15), ex10--, dig++, p++;
/* Summarize rounding-effect of excess digits. */ /* Summarize rounding-effect of excess digits. */
if (dig > STRSCAN_MAXDIG) { if (dig > STRSCAN_MAXDIG) {