mirror of https://gitee.com/openkylin/linux.git
staging: wilc1000: remove WILC_strncmp function
Remove WILC_strncmp function that is changed to strncmp. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3f882895c7
commit
31126a478f
|
@ -18,25 +18,4 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, u32 u32Count)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
s32 WILC_strncmp(const char *pcStr1, const char *pcStr2,
|
|
||||||
u32 u32Count)
|
|
||||||
{
|
|
||||||
s32 s32Result;
|
|
||||||
|
|
||||||
if (pcStr1 == NULL && pcStr2 == NULL) {
|
|
||||||
s32Result = 0;
|
|
||||||
} else if (pcStr1 == NULL) {
|
|
||||||
s32Result = -1;
|
|
||||||
} else if (pcStr2 == NULL) {
|
|
||||||
s32Result = 1;
|
|
||||||
} else {
|
|
||||||
s32Result = strncmp(pcStr1, pcStr2, u32Count);
|
|
||||||
if (s32Result < 0)
|
|
||||||
s32Result = -1;
|
|
||||||
else if (s32Result > 0)
|
|
||||||
s32Result = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return s32Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -60,26 +60,6 @@ static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, u32 u32Count
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* @brief Compares two strings up to u32Count characters
|
|
||||||
* @details Compares 2 strings reporting which is bigger, 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, NULL is valid and considered smaller
|
|
||||||
* than any other non-NULL string (incliding zero lenght strings)
|
|
||||||
* @param[in] pcStr2 the second string, 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
|
|
||||||
*/
|
|
||||||
s32 WILC_strncmp(const char *pcStr1, const char *pcStr2,
|
|
||||||
u32 u32Count);
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue