X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdlib%2Fstrtod.c;h=39b9daada8a5d93df5f625c2f3adc19bdbcb894f;hb=25e6fee27f4a293728dd15b659170e7b9c7db9bc;hp=b444f53056ba7f92a338017e4538ece774a78c2b;hpb=4fb6aa02c88a6b8b718c0ae982d072aa6ab8559f;p=musl

diff --git a/src/stdlib/strtod.c b/src/stdlib/strtod.c
index b444f530..39b9daad 100644
--- a/src/stdlib/strtod.c
+++ b/src/stdlib/strtod.c
@@ -1,32 +1,30 @@
 #include <stdlib.h>
+#include "shgetc.h"
 #include "floatscan.h"
 #include "stdio_impl.h"
 
 static long double strtox(const char *s, char **p, int prec)
 {
-	char *t = (char *)s;
-	while (isspace(*t)) t++;
-	FILE f = {
-		.buf = (void *)t, .rpos = (void *)t,
-		.rend = (void *)-1, .lock = -1
-	};
-	off_t cnt;
-	long double y = __floatscan(&f, -1, prec, 1, &cnt);
-	if (p) *p = cnt ? t + cnt : (char *)s;
+	FILE f;
+	sh_fromstring(&f, s);
+	shlim(&f, 0);
+	long double y = __floatscan(&f, prec, 1);
+	off_t cnt = shcnt(&f);
+	if (p) *p = cnt ? (char *)s + cnt : (char *)s;
 	return y;
 }
 
-float strtof(const char *s, char **p)
+float strtof(const char *restrict s, char **restrict p)
 {
 	return strtox(s, p, 0);
 }
 
-double strtod(const char *s, char **p)
+double strtod(const char *restrict s, char **restrict p)
 {
 	return strtox(s, p, 1);
 }
 
-long double strtold(const char *s, char **p)
+long double strtold(const char *restrict s, char **restrict p)
 {
 	return strtox(s, p, 2);
 }