1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00

Undo bogus change by drepper

This commit is contained in:
Roland McGrath
1995-03-17 17:40:02 +00:00
parent b3fe135050
commit 04282ed1dd
4 changed files with 16 additions and 20 deletions

View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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, not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#include <ansidecl.h>
#include <stdlib.h> #include <stdlib.h>
#undef atof #undef atof
@ -23,8 +24,7 @@ Cambridge, MA 02139, USA. */
/* Convert a string to a double. */ /* Convert a string to a double. */
double double
atof (nptr) DEFUN(atof, (nptr), CONST char *nptr)
const char *nptr;
{ {
return __strtod_internal (nptr, (char **) NULL, 0); return(strtod(nptr, (char **) NULL));
} }

View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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, not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#include <ansidecl.h>
#include <stdlib.h> #include <stdlib.h>
#undef atoi #undef atoi
@ -23,8 +24,7 @@ Cambridge, MA 02139, USA. */
/* Convert a string to an int. */ /* Convert a string to an int. */
int int
atoi (nptr) DEFUN(atoi, (nptr), CONST char *nptr)
const char *nptr;
{ {
return (int) __strtol_internal (nptr, (char **) NULL, 10, 0); return((int) strtol(nptr, (char **) NULL, 10));
} }

View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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, not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#include <ansidecl.h>
#include <stdlib.h> #include <stdlib.h>
#undef atol #undef atol
@ -23,8 +24,7 @@ Cambridge, MA 02139, USA. */
/* Convert a string to a long int. */ /* Convert a string to a long int. */
long int long int
atol (nptr) DEFUN(atol, (nptr), CONST char *nptr)
const char *nptr;
{ {
return __strtol_internal (nptr, (char **) NULL, 10, 0); return(strtol(nptr, (char **) NULL, 10));
} }

View File

@ -405,13 +405,9 @@ INTERNAL (STRTOF) (nptr, endptr, group)
Return current read pointer. */ Return current read pointer. */
if (!isdigit (c) && c != decimal) if (!isdigit (c) && c != decimal)
{ {
if (grouping) tp = correctly_grouped_prefix (start_of_digits, cp, thousands, grouping);
/* Check the grouping of the digits. */ /* If TP is at the start of the digits, there was no correctly
tp = correctly_grouped_prefix (start_of_digits, cp, thousands, grouped prefix of the string; so no number found. */
grouping);
else
tp = cp;
RETURN (0.0, tp == start_of_digits ? nptr : tp); RETURN (0.0, tp == start_of_digits ? nptr : tp);
} }
@ -558,7 +554,7 @@ INTERNAL (STRTOF) (nptr, endptr, group)
assert (dig_no >= int_no); assert (dig_no >= int_no);
} }
number_parsed: number_parsed:
/* The whole string is parsed. Store the address of the next character. */ /* The whole string is parsed. Store the address of the next character. */
if (endptr) if (endptr)