diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2004-01-16 07:55:43 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-01-16 07:55:43 +0000 |
commit | 6ba1261f9596af6a08bbf270e1c18e8ec90be021 (patch) | |
tree | b0081f55485de3f2f279000f522ae9557ae83347 /lib/xstrtod.c | |
parent | 2652a32d3640b6a344adc5797080d8de4ae663a8 (diff) | |
download | gnulib-6ba1261f9596af6a08bbf270e1c18e8ec90be021.tar.gz |
Merge from coreutils.
Diffstat (limited to 'lib/xstrtod.c')
-rw-r--r-- | lib/xstrtod.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/xstrtod.c b/lib/xstrtod.c index 8450829bd2..1a0b4d4603 100644 --- a/lib/xstrtod.c +++ b/lib/xstrtod.c @@ -1,4 +1,4 @@ -/* xstrtod.c - error-checking interface to strtod +/* 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 @@ -26,7 +26,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__ @@ -36,10 +35,12 @@ /* 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 -xstrtod (char const *str, char const **ptr, double *result) +xstrtod (char const *str, char const **ptr, double *result, + double (*convert) (char const *, char **)) { double val; char *terminator; @@ -47,7 +48,7 @@ xstrtod (char const *str, char const **ptr, double *result) 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')) |