[git commit prelink] wchar.h, _collate.c, strlcpy.c: use a common prototype of __wcslcpy
Peter S. Mazinger
ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=1350fdff4b950d42771d6ea7b246e2d269e2bd72
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
include/wchar.h | 5 +++++
libc/string/_collate.c | 3 ---
libc/string/strlcpy.c | 20 +++++---------------
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/include/wchar.h b/include/wchar.h
index ddbb559..0603089 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -783,6 +783,11 @@ libc_hidden_proto(wcsftime_l)
# include <wctype.h>
#endif
+#ifdef _LIBC
+extern size_t __wcslcpy(wchar_t *__restrict dst,
+ const wchar_t *__restrict src, size_t n) attribute_hidden;
+#endif
+
__END_DECLS
#endif /* _WCHAR_H defined */
diff --git a/libc/string/_collate.c b/libc/string/_collate.c
index 58faa5a..be19513 100644
--- a/libc/string/_collate.c
+++ b/libc/string/_collate.c
@@ -537,9 +537,6 @@ libc_hidden_def(__XL_NPP(wcscoll))
#ifdef WANT_WIDE
-extern size_t __wcslcpy(wchar_t *__restrict dst,
- const wchar_t *__restrict src, size_t n);
-
size_t __XL_NPP(wcsxfrm)(wchar_t *__restrict ws1, const wchar_t *__restrict ws2,
size_t n __LOCALE_PARAM )
{
diff --git a/libc/string/strlcpy.c b/libc/string/strlcpy.c
index 049c92e..8378704 100644
--- a/libc/string/strlcpy.c
+++ b/libc/string/strlcpy.c
@@ -9,19 +9,16 @@
#ifdef WANT_WIDE
# define Wstrlcpy __wcslcpy
+# define Wstrxfrm wcsxfrm
#else
# define Wstrlcpy strlcpy
+# define Wstrxfrm strxfrm
#endif
/* OpenBSD function:
* Copy at most n-1 chars from src to dst and nul-terminate dst.
* Returns strlen(src), so truncation occurred if the return value is >= n. */
-#ifdef WANT_WIDE
-size_t Wstrlcpy(register Wchar *__restrict dst,
- register const Wchar *__restrict src,
- size_t n) attribute_hidden;
-#endif
size_t Wstrlcpy(register Wchar *__restrict dst,
register const Wchar *__restrict src,
size_t n)
@@ -45,17 +42,10 @@ size_t Wstrlcpy(register Wchar *__restrict dst,
return src - src0;
}
-#ifdef WANT_WIDE
-
-#ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(__wcslcpy,wcsxfrm)
-#endif
-
-#else
-
+#ifndef WANT_WIDE
libc_hidden_def(strlcpy)
-#ifndef __UCLIBC_HAS_LOCALE__
-strong_alias(strlcpy,strxfrm)
#endif
+#ifndef __UCLIBC_HAS_LOCALE__
+strong_alias(Wstrlcpy,Wstrxfrm)
#endif
--
1.7.3.4
More information about the uClibc-cvs
mailing list