mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
(xstrtod): Accept an extra arg, specifying the conversion function.
Don't include stdlib.h; no longer needed.
This commit is contained in:
1 parent
05c5b74a05
commit
c0f0a326af
1 file changed
+6
-5
+6
-5
@@ -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'))
|
||||
|
||||
Reference in new issue
Block a user