diff options
| author |   Chaehyun Lim <chaehyun.lim@gmail.com> | 2015-08-10 11:33:18 +0900 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-14 18:39:52 -0700 |
| commit | 31126a478fcc9020234d45576b432e7789081e0d (patch) | |
| tree | 2fc74bbdcbcc5bddafe3d6e748aea7ef6105f2ba /drivers/staging | |
| parent | staging: wilc1000: use strncmp instead of WILC_strncmp (diff) | |
| download | linux-dev-31126a478fcc9020234d45576b432e7789081e0d.tar.xz linux-dev-31126a478fcc9020234d45576b432e7789081e0d.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_strutils.c | 21 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_strutils.h | 20 |
2 files changed, 0 insertions, 41 deletions
diff --git a/drivers/staging/wilc1000/wilc_strutils.c b/drivers/staging/wilc1000/wilc_strutils.c index 337e62ff3c79..cc4e9fe0e7ce 100644 --- a/drivers/staging/wilc1000/wilc_strutils.c +++ b/drivers/staging/wilc1000/wilc_strutils.c @@ -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; -} diff --git a/drivers/staging/wilc1000/wilc_strutils.h b/drivers/staging/wilc1000/wilc_strutils.h index 86728d203f71..03f4938a81e1 100644 --- a/drivers/staging/wilc1000/wilc_strutils.h +++ b/drivers/staging/wilc1000/wilc_strutils.h @@ -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 |