sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libs/libc/string: unify implementation across the functions

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko 2022-04-23 15:25:11 +02:00 committed by Xiang Xiao
parent b9827f7ede
commit 8f7af29d74
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/libc/string/lib_strcasecmp.c
View File

@ -35,10 +35,11 @@
#undef strcasecmp /* See mm/README.txt */
int strcasecmp(FAR const char *cs, FAR const char *ct)
{
int result;
register int result;
for (; ; )
{
if ((result = (int)toupper(*cs) - (int)toupper(*ct)) != 0 || !*cs)
if ((result = toupper(*cs) - toupper(*ct)) != 0 ||
*cs == '\0')
{
break;
}

11
libs/libc/string/lib_strcasestr.c
View File

@ -36,15 +36,12 @@ static FAR char *strcasechr(FAR const char *s, int uc)
{
register char ch;
if (s)
for (; *s; s++)
{
for (; *s; s++)
ch = *s;
if (toupper(ch) == uc)
{
ch = *s;
if (toupper(ch) == uc)
{
return (FAR char *)s;
}
return (FAR char *)s;
}
}

2
libs/libc/string/lib_strcmp.c
View File

@ -38,7 +38,7 @@ int strcmp(FAR const char *cs, FAR const char *ct)
for (; ; )
{
if ((result = (unsigned char)*cs - (unsigned char)*ct++) != 0 ||
!*cs++)
*cs++ == '\0')
{
break;
}

7
libs/libc/string/lib_strncasecmp.c
View File

@ -34,12 +34,13 @@
#ifndef CONFIG_ARCH_STRNCASECMP
#undef strncasecmp /* See mm/README.txt */
int strncasecmp(const char *cs, const char *ct, size_t nb)
int strncasecmp(FAR const char *cs, FAR const char *ct, size_t nb)
{
int result = 0;
register int result = 0;
for (; nb > 0; nb--)
{
if ((result = (int)toupper(*cs) - (int)toupper(*ct)) != 0 || !*cs)
if ((result = toupper(*cs) - toupper(*ct)) != 0 ||
*cs == '\0')
{
break;
}

4
libs/libc/string/lib_strncat.c
View File

@ -32,9 +32,9 @@
#ifndef CONFIG_ARCH_STRNCAT
#undef strncat /* See mm/README.txt */
char *strncat(char *dest, const char *src, size_t n)
FAR char *strncat(FAR char *dest, FAR const char *src, size_t n)
{
char *ret = dest;
FAR char *ret = dest;
dest += strlen(dest);
for (; n > 0 && *src != '\0' ; n--)

6
libs/libc/string/lib_strncmp.c
View File

@ -32,13 +32,13 @@
#ifndef CONFIG_ARCH_STRNCMP
#undef strncmp /* See mm/README.txt */
int strncmp(const char *cs, const char *ct, size_t nb)
int strncmp(FAR const char *cs, FAR const char *ct, size_t nb)
{
int result = 0;
register int result = 0;
for (; nb > 0; nb--)
{
if ((result = (unsigned char)*cs - (unsigned char)*ct++) != 0 ||
!*cs++)
*cs++ == '\0')
{
break;
}