+/* 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
+ 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.
+
+ 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, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/* 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 <ctype.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 return zero upon
- successful conversion and put the result in *RESULT. Return
- non-zero upon any failure. */
+ 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
+ specifies the conversion function, e.g., strtod itself. */
int
-xstrtod (str, ptr, result)
- const char *str;
- const char **ptr;
- double *result;
+xstrtod (char const *str, char const **ptr, double *result,
+ double (*convert) (char const *, char **))
{
double val;
char *terminator;
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'))
*result = val;
return fail;
}
-