mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 17:53:37 +08:00
Undo bogus change by drepper
This commit is contained in:
parent
b3fe135050
commit
04282ed1dd
@ -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));
|
||||
}
|
||||
|
@ -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));
|
||||
}
|
||||
|
@ -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));
|
||||
}
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user