From: Arnd Bergmann Date: Mon, 1 Jun 2015 19:06:35 +0000 (+0200) Subject: staging: wilc1000: remove unused string functions X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4ec5d4a4f67771d19ab6a97c2591cbfc3aaba7cc;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: wilc1000: remove unused string functions The driver provides wrappers for a lot of string operations. Some of them are unused, while others should be replaced with normal kernel functions. This replaces the unused ones for now, and leaves the other ones for a later cleanup. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/wilc_osconfig.h b/drivers/staging/wilc1000/wilc_osconfig.h index f3d3108de876..f18615e09400 100644 --- a/drivers/staging/wilc1000/wilc_osconfig.h +++ b/drivers/staging/wilc1000/wilc_osconfig.h @@ -20,7 +20,6 @@ /* #define CONFIG_WILC_MEMORY_POOLS 1 */ /* #define CONFIG_WILC_MEMORY_DEBUG 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ -#define CONFIG_WILC_STRING_UTILS 1 #define CONFIG_WILC_MSG_QUEUE_FEATURE /* #define CONFIG_WILC_MSG_QUEUE_IPC_NAME */ /* #define CONFIG_WILC_MSG_QUEUE_TIMEOUT */ @@ -32,5 +31,4 @@ /* #define CONFIG_WILC_SOCKET_FEATURE */ /* #define CONFIG_WILC_MATH_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_EXTENDED_FILE_OPERATIONS */ -/* #define CONFIG_WILC_EXTENDED_STRING_OPERATIONS */ /* #define CONFIG_WILC_EXTENDED_TIME_OPERATIONS */ diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index 728ce7cac85a..c4e97ae03ae0 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -75,9 +75,7 @@ typedef WILC_Uint16 WILC_WideChar; #endif /* String Utilities */ -#ifdef CONFIG_WILC_STRING_UTILS #include "wilc_strutils.h" -#endif /* Message Queue */ #ifdef CONFIG_WILC_MSG_QUEUE_FEATURE diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h index 35d9f8a917ce..b20bbb839e5a 100644 --- a/drivers/staging/wilc1000/wilc_platform.h +++ b/drivers/staging/wilc1000/wilc_platform.h @@ -50,8 +50,6 @@ #error This feature is not supported by this OS #endif -/* CONFIG_WILC_STRING_UTILS is implemented */ - /* CONFIG_WILC_MSG_QUEUE_FEATURE is implemented */ /* remove the following block when implementing its feature */ @@ -87,8 +85,6 @@ /* CONFIG_WILC_EXTENDED_FILE_OPERATIONS is implemented */ -/* CONFIG_WILC_EXTENDED_STRING_OPERATIONS is implemented */ - /* CONFIG_WILC_EXTENDED_TIME_OPERATIONS is implemented */ /* remove the following block when implementing its feature */ diff --git a/drivers/staging/wilc1000/wilc_strutils.c b/drivers/staging/wilc1000/wilc_strutils.c index 9e525d56feb8..f452fc57f71d 100644 --- a/drivers/staging/wilc1000/wilc_strutils.c +++ b/drivers/staging/wilc1000/wilc_strutils.c @@ -3,8 +3,6 @@ #include "wilc_oswrapper.h" -#ifdef CONFIG_WILC_STRING_UTILS - /*! * @author syounan @@ -37,17 +35,6 @@ void *WILC_memset(void *pvTarget, WILC_Uint8 u8SetValue, WILC_Uint32 u32Count) return memset(pvTarget, u8SetValue, u32Count); } -/*! - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -WILC_Char *WILC_strncat(WILC_Char *pcTarget, const WILC_Char *pcSource, - WILC_Uint32 u32Count) -{ - return strncat(pcTarget, pcSource, u32Count); -} - /*! * @author syounan * @date 18 Aug 2010 @@ -59,33 +46,6 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, return strncpy(pcTarget, pcSource, u32Count); } -/*! - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -WILC_Sint32 WILC_strcmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2) -{ - WILC_Sint32 s32Result; - - if (pcStr1 == WILC_NULL && pcStr2 == WILC_NULL) { - s32Result = 0; - } else if (pcStr1 == WILC_NULL) { - s32Result = -1; - } else if (pcStr2 == WILC_NULL) { - s32Result = 1; - } else { - s32Result = strcmp(pcStr1, pcStr2); - if (s32Result < 0) { - s32Result = -1; - } else if (s32Result > 0) { - s32Result = 1; - } - } - - return s32Result; -} - WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, WILC_Uint32 u32Count) { @@ -109,108 +69,6 @@ WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, return s32Result; } -/* - * @author syounan - * @date 1 Nov 2010 - * @version 2.0 - */ -WILC_Sint32 WILC_strcmp_IgnoreCase(const WILC_Char *pcStr1, const WILC_Char *pcStr2) -{ - WILC_Sint32 s32Result; - - if (pcStr1 == WILC_NULL && pcStr2 == WILC_NULL) { - s32Result = 0; - } else if (pcStr1 == WILC_NULL) { - s32Result = -1; - } else if (pcStr2 == WILC_NULL) { - s32Result = 1; - } else { - WILC_Char cTestedChar1, cTestedChar2; - do { - cTestedChar1 = *pcStr1; - if ((*pcStr1 >= 'a') && (*pcStr1 <= 'z')) { - /* turn a lower case character to an upper case one */ - cTestedChar1 -= 32; - } - - cTestedChar2 = *pcStr2; - if ((*pcStr2 >= 'a') && (*pcStr2 <= 'z')) { - /* turn a lower case character to an upper case one */ - cTestedChar2 -= 32; - } - - pcStr1++; - pcStr2++; - - } while ((cTestedChar1 == cTestedChar2) - && (cTestedChar1 != 0) - && (cTestedChar2 != 0)); - - if (cTestedChar1 > cTestedChar2) { - s32Result = 1; - } else if (cTestedChar1 < cTestedChar2) { - s32Result = -1; - } else { - s32Result = 0; - } - } - - return s32Result; -} - -/*! - * @author aabozaeid - * @date 8 Dec 2010 - * @version 1.0 - */ -WILC_Sint32 WILC_strncmp_IgnoreCase(const WILC_Char *pcStr1, const WILC_Char *pcStr2, - WILC_Uint32 u32Count) -{ - WILC_Sint32 s32Result; - - if (pcStr1 == WILC_NULL && pcStr2 == WILC_NULL) { - s32Result = 0; - } else if (pcStr1 == WILC_NULL) { - s32Result = -1; - } else if (pcStr2 == WILC_NULL) { - s32Result = 1; - } else { - WILC_Char cTestedChar1, cTestedChar2; - do { - cTestedChar1 = *pcStr1; - if ((*pcStr1 >= 'a') && (*pcStr1 <= 'z')) { - /* turn a lower case character to an upper case one */ - cTestedChar1 -= 32; - } - - cTestedChar2 = *pcStr2; - if ((*pcStr2 >= 'a') && (*pcStr2 <= 'z')) { - /* turn a lower case character to an upper case one */ - cTestedChar2 -= 32; - } - - pcStr1++; - pcStr2++; - u32Count--; - - } while ((u32Count > 0) - && (cTestedChar1 == cTestedChar2) - && (cTestedChar1 != 0) - && (cTestedChar2 != 0)); - - if (cTestedChar1 > cTestedChar2) { - s32Result = 1; - } else if (cTestedChar1 < cTestedChar2) { - s32Result = -1; - } else { - s32Result = 0; - } - } - - return s32Result; - -} - /*! * @author syounan * @date 18 Aug 2010 @@ -220,212 +78,3 @@ WILC_Uint32 WILC_strlen(const WILC_Char *pcStr) { return (WILC_Uint32)strlen(pcStr); } - -/*! - * @author bfahmy - * @date 28 Aug 2010 - * @version 1.0 - */ -WILC_Sint32 WILC_strtoint(const WILC_Char *pcStr) -{ - return (WILC_Sint32)(simple_strtol(pcStr, NULL, 10)); -} - -/* - * @author syounan - * @date 1 Nov 2010 - * @version 2.0 - */ -WILC_ErrNo WILC_snprintf(WILC_Char *pcTarget, WILC_Uint32 u32Size, - const WILC_Char *pcFormat, ...) -{ - va_list argptr; - va_start(argptr, pcFormat); - if (vsnprintf(pcTarget, u32Size, pcFormat, argptr) < 0) { - /* if turncation happens windows does not properly terminate strings */ - pcTarget[u32Size - 1] = 0; - } - va_end(argptr); - - /* I find no sane way of detecting errors in windows, so let it all succeed ! */ - return WILC_SUCCESS; -} - -#ifdef CONFIG_WILC_EXTENDED_STRING_OPERATIONS - -/** - * @brief - * @details Searches for the first occurrence of the character c in the first n bytes - * of the string pointed to by the argument str. - * Returns a pointer pointing to the first matching character, - * or null if no match was found. - * @param[in] - * @return - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_memchr(const void *str, WILC_Char c, WILC_Sint32 n) -{ - return (WILC_Char *) memchr(str, c, (size_t)n); -} - -/** - * @brief - * @details Searches for the first occurrence of the character c (an unsigned char) - * in the string pointed to by the argument str. - * The terminating null character is considered to be part of the string. - * Returns a pointer pointing to the first matching character, - * or null if no match was found. - * @param[in] - * @return - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strchr(const WILC_Char *str, WILC_Char c) -{ - return strchr(str, c); -} - -/** - * @brief - * @details Appends the string pointed to by str2 to the end of the string pointed to by str1. - * The terminating null character of str1 is overwritten. - * Copying stops once the terminating null character of str2 is copied. If overlapping occurs, the result is undefined. - * The argument str1 is returned. - * @param[in] WILC_Char* str1, - * @param[in] WILC_Char* str2, - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strcat(WILC_Char *str1, const WILC_Char *str2) -{ - return strcat(str1, str2); -} - -/** - * @brief - * @details Copy pcSource to pcTarget - * @param[in] WILC_Char* pcTarget - * @param[in] const WILC_Char* pcSource - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strcpy(WILC_Char *pcTarget, const WILC_Char *pcSource) -{ - return strncpy(pcTarget, pcSource, strlen(pcSource)); -} - -/** - * @brief - * @details Finds the first sequence of characters in the string str1 that - * does not contain any character specified in str2. - * Returns the length of this first sequence of characters found that - * do not match with str2. - * @param[in] const WILC_Char *str1 - * @param[in] const WILC_Char *str2 - * @return WILC_Uint32 - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Uint32 WILC_strcspn(const WILC_Char *str1, const WILC_Char *str2) -{ - return (WILC_Uint32)strcspn(str1, str2); -} -#if 0 -/** - * @brief - * @details Searches an internal array for the error number errnum and returns a pointer - * to an error message string. - * Returns a pointer to an error message string. - * @param[in] WILC_Sint32 errnum - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strerror(WILC_Sint32 errnum) -{ - return strerror(errnum); -} -#endif - -/** - * @brief - * @details Finds the first occurrence of the entire string str2 - * (not including the terminating null character) which appears in the string str1. - * Returns a pointer to the first occurrence of str2 in str1. - * If no match was found, then a null pointer is returned. - * If str2 points to a string of zero length, then the argument str1 is returned. - * @param[in] const WILC_Char *str1 - * @param[in] const WILC_Char *str2 - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strstr(const WILC_Char *str1, const WILC_Char *str2) -{ - return strstr(str1, str2); -} -#if 0 -/** - * @brief - * @details Parses the C string str interpreting its content as a floating point - * number and returns its value as a double. - * If endptr is not a null pointer, the function also sets the value pointed - * by endptr to point to the first character after the number. - * @param[in] const WILC_Char* str - * @param[in] WILC_Char** endptr - * @return WILC_Double - * @note - * @author remil - * @date 11 Nov 2010 - * @version 1.0 - */ -WILC_Double WILC_StringToDouble(const WILC_Char *str, WILC_Char **endptr) -{ - return strtod (str, endptr); -} -#endif - -/** - * @brief Parses the C string str interpreting its content as an unsigned integral - * number of the specified base, which is returned as an unsigned long int value. - * @details The function first discards as many whitespace characters as necessary - * until the first non-whitespace character is found. - * Then, starting from this character, takes as many characters as possible - * that are valid following a syntax that depends on the base parameter, - * and interprets them as a numerical value. - * Finally, a pointer to the first character following the integer - * representation in str is stored in the object pointed by endptr. - * @param[in] const WILC_Char *str - * @param[in] WILC_Char **endptr - * @param[in] WILC_Sint32 base - * @return WILC_Uint32 - * @note - * @author remil - * @date 11 Nov 2010 - * @version 1.0 - */ -WILC_Uint32 WILC_StringToUint32(const WILC_Char *str, WILC_Char **endptr, WILC_Sint32 base) -{ - return simple_strtoul(str, endptr, base); -} - -#endif - -#endif diff --git a/drivers/staging/wilc1000/wilc_strutils.h b/drivers/staging/wilc1000/wilc_strutils.h index 3a973a5ec61b..62bd1af9e039 100644 --- a/drivers/staging/wilc1000/wilc_strutils.h +++ b/drivers/staging/wilc1000/wilc_strutils.h @@ -10,10 +10,6 @@ * @version 1.0 */ -#ifndef CONFIG_WILC_STRING_UTILS -#error the feature CONFIG_WILC_STRING_UTILS must be supported to include this file -#endif - /*! * @brief Compares two memory buffers * @param[in] pvArg1 pointer to the first memory location @@ -84,22 +80,6 @@ static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32 */ void *WILC_memset(void *pvTarget, WILC_Uint8 u8SetValue, WILC_Uint32 u32Count); -/*! - * @brief Concatenates the contents of 2 strings up to a given count - * @param[in] pcTarget the target string, its null character will be overwritten - * and contents of pcSource will be concatentaed to it - * @param[in] pcSource the source string the will be concatentaed - * @param[in] u32Count copying will proceed until a null character in pcSource - * is encountered or u32Count of bytes copied - * @return value of pcTarget - * @note this function repeats the functionality of standard strncat - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -WILC_Char *WILC_strncat(WILC_Char *pcTarget, const WILC_Char *pcSource, - WILC_Uint32 u32Count); - /*! * @brief copies the contents of source string into the target string * @param[in] pcTarget the target string buffer @@ -115,24 +95,6 @@ WILC_Char *WILC_strncat(WILC_Char *pcTarget, const WILC_Char *pcSource, WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource, WILC_Uint32 u32Count); -/*! - * @brief Compares two strings - * @details Compares 2 strings reporting which is bigger, WILC_NULL is considered - * the smallest string, then a zero length string then all other - * strings depending on thier ascii characters order - * @param[in] pcStr1 the first string, WILC_NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @param[in] pcStr2 the second string, WILC_NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @return 0 if the 2 strings are equal, 1 if pcStr1 is bigger than pcStr2, - * -1 if pcStr1 smaller than pcStr2 - * @note this function repeats the functionality of standard strcmp - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -WILC_Sint32 WILC_strcmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2); - /*! * @brief Compares two strings up to u32Count characters * @details Compares 2 strings reporting which is bigger, WILC_NULL is considered @@ -154,46 +116,6 @@ WILC_Sint32 WILC_strcmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2); WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2, WILC_Uint32 u32Count); -/*! - * @brief Compares two strings ignoring the case of its latin letters - * @details Compares 2 strings reporting which is bigger, WILC_NULL is considered - * the smallest string, then a zero length string then all other - * strings depending on thier ascii characters order with small case - * converted to uppder case - * @param[in] pcStr1 the first string, WILC_NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @param[in] pcStr2 the second string, WILC_NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @return 0 if the 2 strings are equal, 1 if pcStr1 is bigger than pcStr2, - * -1 if pcStr1 smaller than pcStr2 - * @author syounan - * @date 1 Nov 2010 - * @version 2.0 - */ -WILC_Sint32 WILC_strcmp_IgnoreCase(const WILC_Char *pcStr1, const WILC_Char *pcStr2); - -/*! - * @brief Compares two strings ignoring the case of its latin letters up to - * u32Count characters - * @details Compares 2 strings reporting which is bigger, WILC_NULL is considered - * the smallest string, then a zero length string then all other - * strings depending on thier ascii characters order with small case - * converted to uppder case - * @param[in] pcStr1 the first string, WILC_NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @param[in] pcStr2 the second string, WILC_NULL is valid and considered smaller - * than any other non-NULL string (incliding zero lenght strings) - * @param[in] u32Count copying will proceed until a null character in pcStr1 or - * pcStr2 is encountered or u32Count of bytes copied - * @return 0 if the 2 strings are equal, 1 if pcStr1 is bigger than pcStr2, - * -1 if pcStr1 smaller than pcStr2 - * @author aabozaeid - * @date 7 Dec 2010 - * @version 1.0 - */ -WILC_Sint32 WILC_strncmp_IgnoreCase(const WILC_Char *pcStr1, const WILC_Char *pcStr2, - WILC_Uint32 u32Count); - /*! * @brief gets the length of a string * @param[in] pcStr the string @@ -205,208 +127,4 @@ WILC_Sint32 WILC_strncmp_IgnoreCase(const WILC_Char *pcStr1, const WILC_Char *pc */ WILC_Uint32 WILC_strlen(const WILC_Char *pcStr); -/*! - * @brief convert string to integer - * @param[in] pcStr the string - * @return the value of string - * @note this function repeats the functionality of the libc atoi - * @author bfahmy - * @date 28 Aug 2010 - * @version 1.0 - */ -WILC_Sint32 WILC_strtoint(const WILC_Char *pcStr); - -/*! - * @brief print a formatted string into a buffer - * @param[in] pcTarget the buffer where the resulting string is written - * @param[in] u32Size size of the output beffer including the \0 terminating - * character - * @param[in] pcFormat format of the string - * @return number of character written or would have been written if the - * string were not truncated - * @note this function repeats the functionality of standard snprintf - * @author syounan - * @date 1 Nov 2010 - * @version 2.0 - */ -WILC_Sint32 WILC_snprintf(WILC_Char *pcTarget, WILC_Uint32 u32Size, - const WILC_Char *pcFormat, ...); - - -#ifdef CONFIG_WILC_EXTENDED_STRING_OPERATIONS - - -/** - * @brief - * @details Searches for the first occurrence of the character c in the first n bytes - * of the string pointed to by the argument str. - * Returns a pointer pointing to the first matching character, - * or null if no match was found. - * @param[in] - * @return - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_memchr(const void *str, WILC_Char c, WILC_Sint32 n); - -/** - * @brief - * @details Searches for the first occurrence of the character c (an unsigned char) - * in the string pointed to by the argument str. - * The terminating null character is considered to be part of the string. - * Returns a pointer pointing to the first matching character, - * or null if no match was found. - * @param[in] - * @return - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strchr(const WILC_Char *str, WILC_Char c); - -/** - * @brief - * @details Appends the string pointed to by str2 to the end of the string pointed to by str1. - * The terminating null character of str1 is overwritten. - * Copying stops once the terminating null character of str2 is copied. If overlapping occurs, the result is undefined. - * The argument str1 is returned. - * @param[in] WILC_Char* str1, - * @param[in] WILC_Char* str2, - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strcat(WILC_Char *str1, const WILC_Char *str2); - - -/** - * @brief - * @details Copy pcSource to pcTarget - * @param[in] WILC_Char* pcTarget - * @param[in] const WILC_Char* pcSource - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strcpy(WILC_Char *pcTarget, const WILC_Char *pcSource); - - - -/** - * @brief - * @details Finds the first sequence of characters in the string str1 that - * does not contain any character specified in str2. - * Returns the length of this first sequence of characters found that - * do not match with str2. - * @param[in] const WILC_Char *str1 - * @param[in] const WILC_Char *str2 - * @return WILC_Uint32 - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Uint32 WILC_strcspn(const WILC_Char *str1, const WILC_Char *str2); - - -/** - * @brief - * @details Searches an internal array for the error number errnum and returns a pointer - * to an error message string. - * Returns a pointer to an error message string. - * @param[in] WILC_Sint32 errnum - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strerror(WILC_Sint32 errnum); - -/** - * @brief - * @details Finds the first occurrence of the entire string str2 - * (not including the terminating null character) which appears in the string str1. - * Returns a pointer to the first occurrence of str2 in str1. - * If no match was found, then a null pointer is returned. - * If str2 points to a string of zero length, then the argument str1 is returned. - * @param[in] const WILC_Char *str1 - * @param[in] const WILC_Char *str2 - * @return WILC_Char* - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strstr(const WILC_Char *str1, const WILC_Char *str2); - -/** - * @brief - * @details Searches for the first occurrence of the character c (an unsigned char) - * in the string pointed to by the argument str. - * The terminating null character is considered to be part of the string. - * Returns a pointer pointing to the first matching character, - * or null if no match was found. - * @param[in] - * @return - * @note - * @author remil - * @date 3 Nov 2010 - * @version 1.0 - */ -WILC_Char *WILC_strchr(const WILC_Char *str, WILC_Char c); - - -/** - * @brief - * @details Parses the C string str interpreting its content as a floating point - * number and returns its value as a double. - * If endptr is not a null pointer, the function also sets the value pointed - * by endptr to point to the first character after the number. - * @param[in] const WILC_Char* str - * @param[in] WILC_Char** endptr - * @return WILC_Double - * @note - * @author remil - * @date 11 Nov 2010 - * @version 1.0 - */ -WILC_Double WILC_StringToDouble(const WILC_Char *str, - WILC_Char **endptr); - - -/** - * @brief Parses the C string str interpreting its content as an unsigned integral - * number of the specified base, which is returned as an unsigned long int value. - * @details The function first discards as many whitespace characters as necessary - * until the first non-whitespace character is found. - * Then, starting from this character, takes as many characters as possible - * that are valid following a syntax that depends on the base parameter, - * and interprets them as a numerical value. - * Finally, a pointer to the first character following the integer - * representation in str is stored in the object pointed by endptr. - * @param[in] const WILC_Char *str - * @param[in] WILC_Char **endptr - * @param[in] WILC_Sint32 base - * @return WILC_Uint32 - * @note - * @author remil - * @date 11 Nov 2010 - * @version 1.0 - */ -WILC_Uint32 WILC_StringToUint32(const WILC_Char *str, - WILC_Char **endptr, - WILC_Sint32 base); - - - -#endif - #endif