From c0972a5ffc3a6d1fb7ccfa8dc5a11d1afaf7c331 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 29 Jun 2014 00:44:57 +0200 Subject: libiniparser: remove unused function needing float Fixes: | LD ubi-utils/ubiformat | .../git/ubi-utils/libiniparser.a(libiniparser.o): In function | ` LD ubi-utils/ubirename | iniparser_getdouble': | .../git/ubi-utils/libiniparser.c:336: undefined reference to `atof' Grep doesn't reveal any occurrence of iniparser_getdouble(), using atof() so remove it: floating-point is not supported in klibc Upstream-Status: Pending Signed-off-by: Andrea Adami Signed-off-by: David Oberhollenzer --- include/libiniparser.h | 15 --------------- lib/libiniparser.c | 22 ---------------------- 2 files changed, 37 deletions(-) diff --git a/include/libiniparser.h b/include/libiniparser.h index be3c667..abd77aa 100644 --- a/include/libiniparser.h +++ b/include/libiniparser.h @@ -156,21 +156,6 @@ char * iniparser_getstring(dictionary * d, const char * key, char * def); /*--------------------------------------------------------------------------*/ int iniparser_getint(dictionary * d, const char * key, int notfound); -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to a double - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return double - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - */ -/*--------------------------------------------------------------------------*/ -double iniparser_getdouble(dictionary * d, char * key, double notfound); - /*-------------------------------------------------------------------------*/ /** @brief Get the string associated to a key, convert to a boolean diff --git a/lib/libiniparser.c b/lib/libiniparser.c index 898f57f..ba70c08 100644 --- a/lib/libiniparser.c +++ b/lib/libiniparser.c @@ -314,28 +314,6 @@ int iniparser_getint(dictionary * d, const char * key, int notfound) return (int)strtol(str, NULL, 0); } -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to a double - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return double - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - */ -/*--------------------------------------------------------------------------*/ -double iniparser_getdouble(dictionary * d, char * key, double notfound) -{ - char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); - if (str==INI_INVALID_KEY) return notfound ; - return atof(str); -} - /*-------------------------------------------------------------------------*/ /** @brief Get the string associated to a key, convert to a boolean -- cgit v1.2.3