Undo bogus change by drepper

4 files changed, 16 insertions, 20 deletions

diff --git a/stdlib/atof.c b/stdlib/atof.c
index a4b7eb92bd..79585464d1 100644
--- a/stdlib/atof.c
+++ b/stdlib/atof.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -16,6 +16,7 @@ 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.  */
 
+#include <ansidecl.h>
 #include <stdlib.h>
 
 #undef	atof
@@ -23,8 +24,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Convert a string to a double.  */
 double
-atof (nptr)
-     const char *nptr;
+DEFUN(atof, (nptr), CONST char *nptr)
 {
-  return __strtod_internal (nptr, (char **) NULL, 0);
+  return(strtod(nptr, (char **) NULL));
 }
diff --git a/stdlib/atoi.c b/stdlib/atoi.c
index df053710f3..9fe280cc3e 100644
--- a/stdlib/atoi.c
+++ b/stdlib/atoi.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -16,6 +16,7 @@ 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.  */
 
+#include <ansidecl.h>
 #include <stdlib.h>
 
 #undef	atoi
@@ -23,8 +24,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Convert a string to an int.  */
 int
-atoi (nptr)
-     const char *nptr;
+DEFUN(atoi, (nptr), CONST char *nptr)
 {
-  return (int) __strtol_internal (nptr, (char **) NULL, 10, 0);
+  return((int) strtol(nptr, (char **) NULL, 10));
 }
diff --git a/stdlib/atol.c b/stdlib/atol.c
index dd68ce0b74..75f599c107 100644
--- a/stdlib/atol.c
+++ b/stdlib/atol.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -16,6 +16,7 @@ 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.  */
 
+#include <ansidecl.h>
 #include <stdlib.h>
 
 #undef	atol
@@ -23,8 +24,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Convert a string to a long int.  */
 long int
-atol (nptr)
-     const char *nptr;
+DEFUN(atol, (nptr), CONST char *nptr)
 {
-  return __strtol_internal (nptr, (char **) NULL, 10, 0);
+  return(strtol(nptr, (char **) NULL, 10));
 }
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index dcec00c5d7..78f480a600 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -405,13 +405,9 @@ INTERNAL (STRTOF) (nptr, endptr, group)
      Return current read pointer.  */
   if (!isdigit (c) && c != decimal)
     {
-      if (grouping)
-	/* Check the grouping of the digits.  */
-        tp = correctly_grouped_prefix (start_of_digits, cp, thousands,
-				       grouping);
-      else
-	tp = cp;
-
+      tp = correctly_grouped_prefix (start_of_digits, cp, thousands, grouping);
+      /* If TP is at the start of the digits, there was no correctly
+	 grouped prefix of the string; so no number found.  */
       RETURN (0.0, tp == start_of_digits ? nptr : tp);
     }
 
@@ -558,7 +554,7 @@ INTERNAL (STRTOF) (nptr, endptr, group)
       assert (dig_no >= int_no);
     }
 
-  number_parsed:
+ number_parsed:
 
   /* The whole string is parsed.  Store the address of the next character.  */
   if (endptr)