mirror of
git://git.musl-libc.org/musl
synced 2025-03-06 20:48:29 +01:00
unify strtof/strtod/strtold wrappers and fix initial whitespace issue
This commit is contained in:
parent
415c4cd7fd
commit
4fb6aa02c8
3 changed files with 21 additions and 34 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
#include <stdlib.h>
|
||||
#include "floatscan.h"
|
||||
#include "stdio_impl.h"
|
||||
|
||||
float strtof(const char *s, char **p)
|
||||
{
|
||||
FILE f = {
|
||||
.buf = (void *)s, .rpos = (void *)s,
|
||||
.rend = (void *)-1, .lock = -1
|
||||
};
|
||||
off_t cnt;
|
||||
float y = __floatscan(&f, -1, 0, 1, &cnt);
|
||||
if (p) *p = (char *)s + cnt;
|
||||
return y;
|
||||
}
|
|
@ -1,15 +0,0 @@
|
|||
#include <stdlib.h>
|
||||
#include "floatscan.h"
|
||||
#include "stdio_impl.h"
|
||||
|
||||
long double strtold(const char *s, char **p)
|
||||
{
|
||||
FILE f = {
|
||||
.buf = (void *)s, .rpos = (void *)s,
|
||||
.rend = (void *)-1, .lock = -1
|
||||
};
|
||||
off_t cnt;
|
||||
long double y = __floatscan(&f, -1, 2, 1, &cnt);
|
||||
if (p) *p = (char *)s + cnt;
|
||||
return y;
|
||||
}
|
Loading…
Add table
Reference in a new issue