X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtod.c;h=a36a613519d9cbe8f79baf24c950b935fb1ce796;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=838c5c463213ad4d805db6d36d26c2054eab186c;hpb=386767027dea095d9b5985d55243d46788e1d960;p=gnulib.git

diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index 838c5c463..a36a61351 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,48 +1,71 @@
-#ifdef HAVE_CONFIG_H
+/* error-checking interface to strtod-like functions
+
+   Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2013 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 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Jim Meyering.  */
+
 #include <config.h>
-#endif
 
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#else
-double strtod ();
-#endif
+#include "xstrtod.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <limits.h>
-#include <ctype.h>
-#include "xstrtod.h"
+#include <stdio.h>
 
-int
-xstrtod (str, ptr, result)
-     const char *str;
-     const char **ptr;
-     double *result;
+#if LONG
+# define XSTRTOD xstrtold
+# define DOUBLE long double
+#else
+# define XSTRTOD xstrtod
+# define DOUBLE double
+#endif
+
+/* 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
+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;
 }
-