X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxstrtod.c;h=ef4d5bee09f7e0c667c876f97b8390b9209c6164;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=1e55cd1520406ded7e685dbfc309bf410c53b7d7;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git
diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index 1e55cd152..ef4d5bee0 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,10 +1,12 @@
-/* xstrtod.c - error-checking interface to strtod
- Copyright (C) 1996 Free Software Foundation, Inc.
+/* error-checking interface to strtod-like functions
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2010 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,60 +14,58 @@
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
-#ifdef STDC_HEADERS
-# include
-#else
-double strtod ();
-#endif
+#include "xstrtod.h"
#include
-#include
#include
-#include "xstrtod.h"
+#include
+
+#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. */
+/* 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 (str, ptr, result)
- const char *str;
- const char **ptr;
- double *result;
+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 = strtod (str, &terminator);
+ 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;
}
-