projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
lib
/
c-strtod.c
diff --git
a/lib/c-strtod.c
b/lib/c-strtod.c
index
77e5aaf
..
51e996e
100644
(file)
--- a/
lib/c-strtod.c
+++ b/
lib/c-strtod.c
@@
-24,8
+24,7
@@
#include <errno.h>
#include <locale.h>
#include <stdlib.h>
#include <errno.h>
#include <locale.h>
#include <stdlib.h>
-
-#include "xalloc.h"
+#include <string.h>
#if LONG
# define C_STRTOD c_strtold
#if LONG
# define C_STRTOD c_strtold
@@
-74,7
+73,7
@@
C_STRTOD (char const *nptr, char **endptr)
if (!locale)
{
if (endptr)
if (!locale)
{
if (endptr)
-
*endptr =
nptr;
+
*endptr = (char *)
nptr;
return 0; /* errno is set here */
}
return 0; /* errno is set here */
}
@@
-86,7
+85,13
@@
C_STRTOD (char const *nptr, char **endptr)
if (saved_locale)
{
if (saved_locale)
{
- saved_locale = xstrdup (saved_locale);
+ saved_locale = strdup (saved_locale);
+ if (saved_locale == NULL)
+ {
+ if (endptr)
+ *endptr = (char *) nptr;
+ return 0; /* errno is set here */
+ }
setlocale (LC_NUMERIC, "C");
}
setlocale (LC_NUMERIC, "C");
}