* strtod.c (strtod): cast the argument of tolower to unsigned char.

[gnulib.git] / lib / strtod.c

diff --git a/lib/strtod.c b/lib/strtod.c
index 4441102..73f01f9 100644 (file)
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -1,49 +1,37 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1997, 1999, 2003, 2006 Free Software Foundation, Inc.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   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 GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <errno.h>
+
 #include <ctype.h>
+
 #include <math.h>
 
-#if STDC_HEADERS
 #include <float.h>
 #include <stdlib.h>
 #include <string.h>
-#else
-#define NULL 0
-#define DBL_MAX 1.7976931348623159e+308
-#define DBL_MIN 2.2250738585072010e-308
-extern int errno;
-#endif
-#ifndef HUGE_VAL
-#define HUGE_VAL HUGE
-#endif
-
-#if !__STDC__
-#define const
-#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;
@@ -66,7 +54,7 @@ strtod (nptr, endptr)
   s = nptr;
 
   /* Eat whitespace.  */
-  while (isspace (*s))
+  while (isspace ((unsigned char) *s))
     ++s;
 
   /* Get the sign.  */
@@ -80,7 +68,7 @@ strtod (nptr, endptr)
   exponent = 0;
   for (;; ++s)
     {
-      if (isdigit (*s))
+      if ('0' <= *s && *s <= '9')
        {
          got_digit = 1;
 
@@ -113,7 +101,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;