X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtod.c;h=7caa615ddf73f2df216741f79e7076964e4ca898;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=1a0b4d46038df6cfbdb595af1644e0a333724858;hpb=6ba1261f9596af6a08bbf270e1c18e8ec90be021;p=gnulib.git
diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index 1a0b4d460..7caa615dd 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,10 +1,12 @@
/* error-checking interface to strtod-like functions
- Copyright (C) 1996, 1999, 2000, 2003 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
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
@@ -12,14 +14,11 @@
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 . */
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "xstrtod.h"
@@ -27,43 +26,46 @@
#include
#include
-/* 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
-/* An interface to strtod that encapsulates all the error checking
- one should usually perform. Like strtod, but upon successful
- conversion put the result in *RESULT and return zero. Return
- non-zero and don't modify *RESULT upon any failure. CONVERT
+/* 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. */
-int
-xstrtod (char const *str, char const **ptr, double *result,
- double (*convert) (char const *, char **))
+bool
+XSTRTOD (char const *str, char const **ptr, DOUBLE *result,
+ DOUBLE (*convert) (char const *, char **))
{
- double val;
+ DOUBLE val;
char *terminator;
- int fail;
+ bool ok = true;
- fail = 0;
errno = 0;
val = convert (str, &terminator);
/* Having a non-zero terminator is an error only when PTR is NULL. */
if (terminator == str || (ptr == NULL && *terminator != '\0'))
- fail = 1;
+ ok = false;
else
{
- /* Allow underflow (in which case strtod returns zero),
- but flag overflow as an error. */
- if (val != 0.0 && errno == ERANGE)
- fail = 1;
+ /* Allow underflow (in which case CONVERT returns zero),
+ but flag overflow as an error. */
+ if (val != 0 && errno == ERANGE)
+ ok = false;
}
if (ptr != NULL)
*ptr = terminator;
*result = val;
- return fail;
+ return ok;
}