X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstrtod.c;h=bba537af282f7cc1158408c780bebacfef0bf44f;hb=f19812dec8982dc3c69d3b6995025184dd4dbddb;hp=2f6b894cfa7b842445575765cd6bc58e0fdfa128;hpb=8f16c54c8c8a7ba8826daa774c4229fd1c7adb77;p=gnulib.git
diff --git a/lib/strtod.c b/lib/strtod.c
index 2f6b894cf..bba537af2 100644
--- 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
- 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
@@ -11,41 +11,24 @@
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 . */
-#ifdef HAVE_CONFIG_H
#include
-#endif
#include
+
#include
+
#include
-#ifdef HAVE_FLOAT_H
#include
-#else
-#define DBL_MAX 1.7976931348623159e+308
-#define DBL_MIN 2.2250738585072010e-308
-#endif
-
-#if STDC_HEADERS
#include
#include
-#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
-strtod (nptr, endptr)
- const char *nptr;
- char **endptr;
+strtod (const char *nptr, char **endptr)
{
register const char *s;
short int sign;
@@ -68,7 +51,7 @@ strtod (nptr, endptr)
s = nptr;
/* Eat whitespace. */
- while (isspace (*s))
+ while (isspace ((unsigned char) *s))
++s;
/* Get the sign. */
@@ -82,7 +65,7 @@ strtod (nptr, endptr)
exponent = 0;
for (;; ++s)
{
- if (isdigit (*s))
+ if ('0' <= *s && *s <= '9')
{
got_digit = 1;
@@ -115,7 +98,7 @@ strtod (nptr, endptr)
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;