From 4fb6aa02c88a6b8b718c0ae982d072aa6ab8559f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 10 Apr 2012 20:25:06 -0400 Subject: unify strtof/strtod/strtold wrappers and fix initial whitespace issue --- src/stdlib/strtod.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'src/stdlib/strtod.c') diff --git a/src/stdlib/strtod.c b/src/stdlib/strtod.c index 98b992a1..b444f530 100644 --- a/src/stdlib/strtod.c +++ b/src/stdlib/strtod.c @@ -2,14 +2,31 @@ #include "floatscan.h" #include "stdio_impl.h" -double strtod(const char *s, char **p) +static long double strtox(const char *s, char **p, int prec) { + char *t = (char *)s; + while (isspace(*t)) t++; FILE f = { - .buf = (void *)s, .rpos = (void *)s, + .buf = (void *)t, .rpos = (void *)t, .rend = (void *)-1, .lock = -1 }; off_t cnt; - double y = __floatscan(&f, -1, 1, 1, &cnt); - if (p) *p = (char *)s + cnt; + long double y = __floatscan(&f, -1, prec, 1, &cnt); + if (p) *p = cnt ? t + cnt : (char *)s; return y; } + +float strtof(const char *s, char **p) +{ + return strtox(s, p, 0); +} + +double strtod(const char *s, char **p) +{ + return strtox(s, p, 1); +} + +long double strtold(const char *s, char **p) +{ + return strtox(s, p, 2); +} -- cgit v1.2.1