projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/getdelim.c (getdelim): Don't leak memory upon failed realloc.
[gnulib.git]
/
lib
/
strtod.c
diff --git
a/lib/strtod.c
b/lib/strtod.c
index
2f6b894
..
bba537a
100644
(file)
--- a/
lib/strtod.c
+++ b/
lib/strtod.c
@@
-1,9
+1,9
@@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992
, 1997, 1999, 2003, 2006
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-11,41
+11,24
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
#include <config.h>
-#endif
#include <errno.h>
#include <errno.h>
+
#include <ctype.h>
#include <ctype.h>
+
#include <math.h>
#include <math.h>
-#ifdef HAVE_FLOAT_H
#include <float.h>
#include <float.h>
-#else
-#define DBL_MAX 1.7976931348623159e+308
-#define DBL_MIN 2.2250738585072010e-308
-#endif
-
-#if STDC_HEADERS
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#else
-#define NULL 0
-extern int errno;
-#ifndef HUGE_VAL
-#define HUGE_VAL HUGE
-#endif
-#endif
/* Convert NPTR to a double. If ENDPTR is not NULL, a pointer to the
character after the last one used in the number is put in *ENDPTR. */
double
/* Convert NPTR to a double. If ENDPTR is not NULL, a pointer to the
character after the last one used in the number is put in *ENDPTR. */
double
-strtod (nptr, endptr)
- const char *nptr;
- char **endptr;
+strtod (const char *nptr, char **endptr)
{
register const char *s;
short int sign;
{
register const char *s;
short int sign;
@@
-68,7
+51,7
@@
strtod (nptr, endptr)
s = nptr;
/* Eat whitespace. */
s = nptr;
/* Eat whitespace. */
- while (isspace (*s))
+ while (isspace (
(unsigned char)
*s))
++s;
/* Get the sign. */
++s;
/* Get the sign. */
@@
-82,7
+65,7
@@
strtod (nptr, endptr)
exponent = 0;
for (;; ++s)
{
exponent = 0;
for (;; ++s)
{
- if (
isdigit (*s)
)
+ if (
'0' <= *s && *s <= '9'
)
{
got_digit = 1;
{
got_digit = 1;
@@
-115,7
+98,7
@@
strtod (nptr, endptr)
if (!got_digit)
goto noconv;
if (!got_digit)
goto noconv;
- if (tolower (*s) == 'e')
+ if (tolower (
(unsigned char)
*s) == 'e')
{
/* Get the exponent specified after the `e' or `E'. */
int save = errno;
{
/* Get the exponent specified after the `e' or `E'. */
int save = errno;