mirror of
git://git.musl-libc.org/musl
synced 2024-12-14 02:35:17 +00:00
further fixes to leading space issue (forgot the wide versions)
This commit is contained in:
parent
cb81b6947c
commit
1bf725eda7
@ -39,9 +39,11 @@ static long double wcstox(const wchar_t *s, wchar_t **p, int prec)
|
||||
while (iswspace(*t)) t++;
|
||||
f.cookie = (void *)t;
|
||||
shlim(&f, 0);
|
||||
long double y = __floatscan(&f, -1, prec, 1);
|
||||
off_t cnt = shcnt(&f);
|
||||
if (p) *p = cnt ? t + cnt : (wchar_t *)s;
|
||||
long double y = __floatscan(&f, prec, 1);
|
||||
if (p) {
|
||||
size_t cnt = shcnt(&f);
|
||||
*p = cnt ? t + cnt : (wchar_t *)s;
|
||||
}
|
||||
return y;
|
||||
}
|
||||
|
||||
|
@ -27,6 +27,7 @@ static size_t do_read(FILE *f, unsigned char *buf, size_t len)
|
||||
|
||||
static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsigned long long lim)
|
||||
{
|
||||
wchar_t *t = (wchar_t *)s;
|
||||
unsigned char buf[64];
|
||||
FILE f = {0};
|
||||
f.flags = 0;
|
||||
@ -35,12 +36,13 @@ static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsign
|
||||
f.buf_size = sizeof buf - 4;
|
||||
f.lock = -1;
|
||||
f.read = do_read;
|
||||
f.cookie = (void *)s;
|
||||
while (iswspace(*t)) t++;
|
||||
f.cookie = (void *)t;
|
||||
shlim(&f, 0);
|
||||
unsigned long long y = __intscan(&f, base, 1, lim);
|
||||
if (p) {
|
||||
size_t cnt = shcnt(&f);
|
||||
*p = (wchar_t *)s + cnt;
|
||||
*p = cnt ? t + cnt : (wchar_t *)s;
|
||||
}
|
||||
return y;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user