projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: use ASCII in .texi files where UTF-8 isn't needed
[gnulib.git]
/
lib
/
xstrtod.c
diff --git
a/lib/xstrtod.c
b/lib/xstrtod.c
index
4b5bcc9
..
7caa615
100644
(file)
--- a/
lib/xstrtod.c
+++ b/
lib/xstrtod.c
@@
-1,11
+1,12
@@
/* error-checking interface to strtod-like functions
/* error-checking interface to strtod-like functions
- Copyright (C) 1996, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2014 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,14
+14,11
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xstrtod.h"
#include "xstrtod.h"
@@
-28,22
+26,26
@@
#include <limits.h>
#include <stdio.h>
#include <limits.h>
#include <stdio.h>
-/* Tell the compiler that non-default rounding modes are used. */
-#if 199901 <= __STDC_VERSION__
- #pragma STDC FENV_ACCESS ON
+#if LONG
+# define XSTRTOD xstrtold
+# define DOUBLE long double
+#else
+# define XSTRTOD xstrtod
+# define DOUBLE double
#endif
#endif
-/* An interface to strtod that encapsulates all the error checking
- one should usually perform. Like strtod, but upon successful
+/* An interface to a string-to-floating-point conversion function that
+ encapsulates all the error checking one should usually perform.
+ Like strtod/strtold, but upon successful
conversion put the result in *RESULT and return true. Return
false and don't modify *RESULT upon any failure. CONVERT
specifies the conversion function, e.g., strtod itself. */
bool
conversion put the result in *RESULT and return true. Return
false and don't modify *RESULT upon any failure. CONVERT
specifies the conversion function, e.g., strtod itself. */
bool
-
xstrtod (char const *str, char const **ptr, double
*result,
-
double
(*convert) (char const *, char **))
+
XSTRTOD (char const *str, char const **ptr, DOUBLE
*result,
+
DOUBLE
(*convert) (char const *, char **))
{
{
-
double
val;
+
DOUBLE
val;
char *terminator;
bool ok = true;
char *terminator;
bool ok = true;
@@
-55,10
+57,10
@@
xstrtod (char const *str, char const **ptr, double *result,
ok = false;
else
{
ok = false;
else
{
- /* Allow underflow (in which case
strtod
returns zero),
- but flag overflow as an error. */
- if (val != 0
.0
&& errno == ERANGE)
- ok = false;
+ /* Allow underflow (in which case
CONVERT
returns zero),
+
but flag overflow as an error. */
+ if (val != 0 && errno == ERANGE)
+
ok = false;
}
if (ptr != NULL)
}
if (ptr != NULL)