Browse Source

fix mismatched signatures for strtod_l family

strtod_l, strtof_l, and strtold_l originally existed only as
glibc-ABI-compat symbols. as noted in the commit which added them,
17a60f9d32, making them aliases for the
non-_l functions was a hack and not appropriate if they ever became
public API.

unfortunately, commit 35eb1a1a9b did
make them public without undoing the hack. fix that now by moving the
the _l functions to their own file as wrappers that just throw away
the locale_t argument.
master
Rich Felker 4 years ago
parent
commit
8d404733e1
  1. 22
      src/locale/strtod_l.c
  2. 7
      src/stdlib/strtod.c

22
src/locale/strtod_l.c

@ -0,0 +1,22 @@
#define _GNU_SOURCE
#include <stdlib.h>
#include <locale.h>
float strtof_l(const char *restrict s, char **restrict p, locale_t l)
{
return strtof(s, p);
}
double strtod_l(const char *restrict s, char **restrict p, locale_t l)
{
return strtod(s, p);
}
long double strtold_l(const char *restrict s, char **restrict p, locale_t l)
{
return strtold(s, p);
}
weak_alias(strtof_l, __strtof_l);
weak_alias(strtod_l, __strtod_l);
weak_alias(strtold_l, __strtold_l);

7
src/stdlib/strtod.c

@ -28,10 +28,3 @@ long double strtold(const char *restrict s, char **restrict p)
{
return strtox(s, p, 2);
}
weak_alias(strtof, strtof_l);
weak_alias(strtod, strtod_l);
weak_alias(strtold, strtold_l);
weak_alias(strtof, __strtof_l);
weak_alias(strtod, __strtod_l);
weak_alias(strtold, __strtold_l);

Loading…
Cancel
Save