diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-11-27 18:21:33 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-11-27 18:21:33 +0000 |
| commit | 28c8634afdc1fa236679b49ab0d5a019379c6db1 (patch) | |
| tree | fda9d6e124a32799b07247f8d38d0cc8f963cd4e /libc/string/strlcpy.c | |
| parent | eb38b2d34c32ed3089e2bf8935219a57f84ce7b3 (diff) | |
| download | uClibc-alpine-28c8634afdc1fa236679b49ab0d5a019379c6db1.tar.bz2 uClibc-alpine-28c8634afdc1fa236679b49ab0d5a019379c6db1.tar.xz | |
Synch with trunk @ 24165
Step 17: libc_hidden_proto removal (almost all).
and other minor changes (inline keyword, extra character)
Diffstat (limited to 'libc/string/strlcpy.c')
| -rw-r--r-- | libc/string/strlcpy.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libc/string/strlcpy.c b/libc/string/strlcpy.c index 4bdf0daa6..0ccfc0e8a 100644 --- a/libc/string/strlcpy.c +++ b/libc/string/strlcpy.c @@ -9,14 +9,10 @@ #ifdef WANT_WIDE # define Wstrlcpy __wcslcpy -# define Wstrxfrm wcsxfrm #else -/* Experimentally off - libc_hidden_proto(strlcpy) */ # 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. */ @@ -49,16 +45,19 @@ size_t Wstrlcpy(register Wchar *__restrict dst, return src - src0; } -#ifndef WANT_WIDE -libc_hidden_def(strlcpy) +#ifdef WANT_WIDE + #ifndef __UCLIBC_HAS_LOCALE__ -/* Experimentally off - libc_hidden_proto(strxfrm) */ -strong_alias(strlcpy,strxfrm) -libc_hidden_def(strxfrm) +strong_alias(__wcslcpy,wcsxfrm) +libc_hidden_def(wcsxfrm) #endif + #else + +libc_hidden_def(strlcpy) #ifndef __UCLIBC_HAS_LOCALE__ -strong_alias(__wcslcpy,wcsxfrm) -libc_hidden_def(wcsxfrm) +strong_alias(strlcpy,strxfrm) +libc_hidden_def(strxfrm) #endif + #endif |