From 2162541f38d3f642f5a643010548d62220d55a4d Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 10 Apr 2012 21:47:37 -0400 Subject: add "scan helper getc" and rework strtod, etc. to use it the immediate benefit is a significant debloating of the float parsing code by moving the responsibility for keeping track of the number of characters read to a different module. by linking shgetc with the stdio buffer logic, counting logic is defered to buffer refill time, keeping the calls to shgetc fast and light. in the future, shgetc will also be useful for integrating the new float code with scanf, which needs to not only count the characters consumed, but also limit the number of characters read based on field width specifiers. shgetc may also become a useful tool for simplifying the integer parsing code. --- src/stdlib/strtod.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/stdlib') diff --git a/src/stdlib/strtod.c b/src/stdlib/strtod.c index b444f530..ecfabdf1 100644 --- a/src/stdlib/strtod.c +++ b/src/stdlib/strtod.c @@ -1,4 +1,5 @@ #include +#include "shgetc.h" #include "floatscan.h" #include "stdio_impl.h" @@ -10,8 +11,9 @@ static long double strtox(const char *s, char **p, int prec) .buf = (void *)t, .rpos = (void *)t, .rend = (void *)-1, .lock = -1 }; - off_t cnt; - long double y = __floatscan(&f, -1, prec, 1, &cnt); + shlim(&f, 0); + long double y = __floatscan(&f, -1, prec, 1); + off_t cnt = shcnt(&f); if (p) *p = cnt ? t + cnt : (char *)s; return y; } -- cgit v1.2.1