You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/06/03 19:25:57 UTC
[incubator-nuttx] 03/04: libc/wchar: Remove the unnecessary cast
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4c34075d103ad5571a2465b05b6ba9006b117c7d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue May 31 01:25:39 2022 +0800
libc/wchar: Remove the unnecessary cast
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
libs/libc/wchar/lib_btowc.c | 4 ++--
libs/libc/wchar/lib_mbrtowc.c | 9 +--------
libs/libc/wchar/lib_wcrtomb.c | 9 +--------
libs/libc/wchar/lib_wcscmp.c | 4 ++--
libs/libc/wchar/lib_wctob.c | 2 +-
libs/libc/wchar/lib_wmemcpy.c | 2 +-
libs/libc/wchar/lib_wmemmove.c | 2 +-
libs/libc/wchar/lib_wmemset.c | 2 +-
8 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/libs/libc/wchar/lib_btowc.c b/libs/libc/wchar/lib_btowc.c
index 7f1fdfc17a..6703f2589a 100644
--- a/libs/libc/wchar/lib_btowc.c
+++ b/libs/libc/wchar/lib_btowc.c
@@ -66,13 +66,13 @@ wint_t btowc(int c)
b = (char)c;
- retval = mbtowc(&pwc, (FAR const char *)&b, 1);
+ retval = mbtowc(&pwc, &b, 1);
if (retval != 0 && retval != 1)
{
return WEOF;
}
- return (wint_t)pwc;
+ return pwc;
}
#endif
diff --git a/libs/libc/wchar/lib_mbrtowc.c b/libs/libc/wchar/lib_mbrtowc.c
index 8f7961f768..8acf296b62 100644
--- a/libs/libc/wchar/lib_mbrtowc.c
+++ b/libs/libc/wchar/lib_mbrtowc.c
@@ -68,13 +68,6 @@ size_t mbrtowc(FAR wchar_t *pwc, FAR const char *s,
retval = mbtowc(pwc, s, n);
}
- if (retval == -1)
- {
- return (size_t)(-1);
- }
- else
- {
- return (size_t)retval;
- }
+ return retval;
}
#endif
diff --git a/libs/libc/wchar/lib_wcrtomb.c b/libs/libc/wchar/lib_wcrtomb.c
index cccdde06ca..c391b13670 100644
--- a/libs/libc/wchar/lib_wcrtomb.c
+++ b/libs/libc/wchar/lib_wcrtomb.c
@@ -69,13 +69,6 @@ size_t wcrtomb(FAR char *s, wchar_t wc, FAR mbstate_t *ps)
retval = wctomb(s, wc);
}
- if (retval == -1)
- {
- return (size_t)(-1);
- }
- else
- {
- return (size_t)retval;
- }
+ return retval;
}
#endif
diff --git a/libs/libc/wchar/lib_wcscmp.c b/libs/libc/wchar/lib_wcscmp.c
index 788aa77940..2809a65842 100644
--- a/libs/libc/wchar/lib_wcscmp.c
+++ b/libs/libc/wchar/lib_wcscmp.c
@@ -63,10 +63,10 @@ int wcscmp(FAR const wchar_t *s1, FAR const wchar_t *s2)
{
if (*s1++ == 0)
{
- return (0);
+ return 0;
}
}
- return (*s1 - *--s2);
+ return *s1 - *--s2;
}
#endif
diff --git a/libs/libc/wchar/lib_wctob.c b/libs/libc/wchar/lib_wctob.c
index 5329ff8cbb..2660ded94e 100644
--- a/libs/libc/wchar/lib_wctob.c
+++ b/libs/libc/wchar/lib_wctob.c
@@ -57,6 +57,6 @@ int wctob(wint_t wc)
return EOF;
}
- return wctomb(pmb, wc) == 1 ? (int)pmb[0] : EOF;
+ return wctomb(pmb, wc) == 1 ? pmb[0] : EOF;
}
#endif
diff --git a/libs/libc/wchar/lib_wmemcpy.c b/libs/libc/wchar/lib_wmemcpy.c
index a1fcfebc28..84003b16a6 100644
--- a/libs/libc/wchar/lib_wmemcpy.c
+++ b/libs/libc/wchar/lib_wmemcpy.c
@@ -55,6 +55,6 @@
FAR wchar_t *wmemcpy(FAR wchar_t *d, FAR const wchar_t *s, size_t n)
{
- return (FAR wchar_t *)memcpy(d, s, n * sizeof(wchar_t));
+ return memcpy(d, s, n * sizeof(wchar_t));
}
#endif
diff --git a/libs/libc/wchar/lib_wmemmove.c b/libs/libc/wchar/lib_wmemmove.c
index 5992153e17..03ab9b8559 100644
--- a/libs/libc/wchar/lib_wmemmove.c
+++ b/libs/libc/wchar/lib_wmemmove.c
@@ -54,6 +54,6 @@
FAR wchar_t *wmemmove(FAR wchar_t *d, FAR const wchar_t *s, size_t n)
{
- return (FAR wchar_t *)memmove(d, s, n * sizeof(wchar_t));
+ return memmove(d, s, n * sizeof(wchar_t));
}
#endif
diff --git a/libs/libc/wchar/lib_wmemset.c b/libs/libc/wchar/lib_wmemset.c
index 8148dba03d..6fa2dff11f 100644
--- a/libs/libc/wchar/lib_wmemset.c
+++ b/libs/libc/wchar/lib_wmemset.c
@@ -57,7 +57,7 @@ FAR wchar_t *wmemset(FAR wchar_t *s, wchar_t c, size_t n)
FAR wchar_t *p;
size_t i;
- p = (FAR wchar_t *)s;
+ p = s;
for (i = 0; i < n; i++)
{
*p = c;