X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtod.c;h=4b5bcc9c58f941e1aa4ab7747f06942963b3f132;hb=e57dfac3355164cfbfcb5473a42130dab793fe9f;hp=f6edefccebc6d0071634fc7813ca5a18c1eead12;hpb=b8d7f00196977bc8aebd45c724c9f84b1536aecd;p=gnulib.git

diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index f6edefcce..4b5bcc9c5 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,5 +1,6 @@
-/* xstrtod.c - error-checking interface to strtod
-   Copyright (C) 1996 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
@@ -18,54 +19,51 @@
 /* Written by Jim Meyering.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# 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 "xstrtod.h"
+#include <stdio.h>
+
+/* Tell the compiler that non-default rounding modes are used.  */
+#if 199901 <= __STDC_VERSION__
+ #pragma STDC FENV_ACCESS ON
+#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.  */
+   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;
   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;
 }
-