X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtod.c;h=06360dd3f8ea3f2a83047022a9e420ff567de164;hb=5131be5b019b1110cd597012b63e48886aaaafc7;hp=8450829bd2b949e532d2fa11a780a0b85f0fea17;hpb=fa9635f22ac175bace582885ca780d3eb511b578;p=gnulib.git

diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index 8450829bd..06360dd3f 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,5 +1,6 @@
-/* xstrtod.c - error-checking interface to strtod
-   Copyright (C) 1996, 1999, 2000, 2003 Free Software Foundation, Inc.
+/* error-checking interface to strtod-like functions
+
+   Copyright (C) 1996, 1999, 2000, 2003, 2004 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
@@ -13,7 +14,7 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
@@ -26,7 +27,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 /* Tell the compiler that non-default rounding modes are used.  */
 #if 199901 <= __STDC_VERSION__
@@ -35,34 +35,35 @@
 
 /* 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.  */
+   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)
+bool
+xstrtod (char const *str, char const **ptr, double *result,
+	 double (*convert) (char const *, char **))
 {
   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;
+	ok = false;
     }
 
   if (ptr != NULL)
     *ptr = terminator;
 
   *result = val;
-  return fail;
+  return ok;
 }