projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo "it it" in changelog entry.
[gnulib.git]
/
lib
/
xstrtod.c
diff --git
a/lib/xstrtod.c
b/lib/xstrtod.c
index
1e55cd1
..
1a0b4d4
100644
(file)
--- a/
lib/xstrtod.c
+++ b/
lib/xstrtod.c
@@
-1,5
+1,5
@@
-/*
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
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
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
@@
-21,27
+21,26
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-double strtod ();
-#endif
+#include "xstrtod.h"
#include <errno.h>
#include <errno.h>
-#include <stdio.h>
#include <limits.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
/* 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. */
+ non-zero and don't modify *RESULT upon any failure. CONVERT
+ specifies the conversion function, e.g., strtod itself. */
int
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;
{
double val;
char *terminator;
@@
-49,7
+48,7
@@
xstrtod (str, ptr, result)
fail = 0;
errno = 0;
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'))
/* Having a non-zero terminator is an error only when PTR is NULL. */
if (terminator == str || (ptr == NULL && *terminator != '\0'))
@@
-68,4
+67,3
@@
xstrtod (str, ptr, result)
*result = val;
return fail;
}
*result = val;
return fail;
}
-