X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtod.c;h=0ee7a7f7ca600a50716d43eeb7a7bac9b4cef2ed;hb=573dad2ce496fa87dac2e79f37bae62e0be1d2c6;hp=bab8b1219a21f351d88ced4ef907d2eca6163e44;hpb=3738de89a7147a0e0fe78f80757caedc6834cf3a;p=gnulib.git diff --git a/lib/xstrtod.c b/lib/xstrtod.c index bab8b1219..0ee7a7f7c 100644 --- a/lib/xstrtod.c +++ b/lib/xstrtod.c @@ -1,53 +1,71 @@ -#ifdef HAVE_CONFIG_H +/* error-checking interface to strtod-like functions + + Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2012 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 . */ + +/* Written by Jim Meyering. */ + #include -#endif -#ifdef STDC_HEADERS -#include -#else -double strtod (); -#endif +#include "xstrtod.h" #include -#include #include -#include -#include "xstrtod.h" +#include -/* 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. */ +#if LONG +# define XSTRTOD xstrtold +# define DOUBLE long double +#else +# define XSTRTOD xstrtod +# define DOUBLE double +#endif -int -xstrtod (str, ptr, result) - const char *str; - const char **ptr; - double *result; +/* 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; } -