aboutsummaryrefslogtreecommitdiffstats
path: root/src/wchar
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2015-09-01 03:02:41 +0200
committerMattias Andrée <maandree@operamail.com>2015-09-01 03:02:41 +0200
commit5a5e2ba6e1f9babb048a620168e1c75d838e4dda (patch)
treed163d146d22843f6672de31a5a3f19dbd0c9d0f2 /src/wchar
parentadd strchr and variants (diff)
downloadslibc-5a5e2ba6e1f9babb048a620168e1c75d838e4dda.tar.gz
slibc-5a5e2ba6e1f9babb048a620168e1c75d838e4dda.tar.bz2
slibc-5a5e2ba6e1f9babb048a620168e1c75d838e4dda.tar.xz
wcswcs is deprecated
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/wchar')
-rw-r--r--src/wchar/wcscpy.c4
-rw-r--r--src/wchar/wcsmove.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wchar/wcscpy.c b/src/wchar/wcscpy.c
index cc60edc..7d75a98 100644
--- a/src/wchar/wcscpy.c
+++ b/src/wchar/wcscpy.c
@@ -94,7 +94,7 @@ wchar_t* wcsccpy(wchar_t* restrict whither, const wchar_t* restrict whence, wcha
*/
wchar_t* wcswcscpy(wchar_t* restrict whither, const wchar_t* restrict whence, const wchar_t* restrict str)
{
- const wchar_t* stop = str == NULL ? NULL : wcswcs(whence, str);
+ const wchar_t* stop = str == NULL ? NULL : wcsstr(whence, str);
size_t n = stop == NULL ? wcslen(whence) : (size_t)(stop - whence);
wchar_t* r = stop == NULL ? NULL ? whither + n;
wmemcpy(whither, whence, n);
@@ -213,7 +213,7 @@ wchar_t* wcscncpy(wchar_t* restrict whither, const wchar_t* restrict whence, wch
wchar_t* wcswcsncpy(wchar_t* restrict whither, const wchar_t* restrict whence,
const wchar_t* restrict str, size_t maxlen)
{
- const char* stop = wcsnwcs(whence, str, maxlen);
+ const char* stop = wcsnstr(whence, str, maxlen);
size_t n = stop == NULL ? wcsnlen(whence, maxlen) : (size_t)(stop - whence);
char* r = stop == NULL ? NULL : (whither + n);
wmemcpy(whither, whence, n);
diff --git a/src/wchar/wcsmove.c b/src/wchar/wcsmove.c
index 298d0a8..c84e4ee 100644
--- a/src/wchar/wcsmove.c
+++ b/src/wchar/wcsmove.c
@@ -96,7 +96,7 @@ wchar_t* wcscmove(wchar_t* whither, const wchar_t* whence, wchat_t c)
*/
wchar_t* wcswcsmove(wchar_t* whither, const wchar_t* whence, const wchar_t* restrict str)
{
- const wchar_t* stop = str == NULL ? NULL : wcswcs(whence, str);
+ const wchar_t* stop = str == NULL ? NULL : wcsstr(whence, str);
size_t n = stop == NULL ? wcslen(whence) : (size_t)(stop - whence);
wchar_t* r = stop == NULL ? NULL ? whither + n;
wmemmove(whither, whence, n);
@@ -215,7 +215,7 @@ wchar_t* wcscnmove(wchar_t* whither, const wchar_t* whence, wchat_t c, size_t ma
*/
wchar_t* wcswcsnmove(wchar_t* whither, const wchar_t* whence, const wchar_t* restrict str, size_t maxlen)
{
- const char* stop = wcsnwcs(whence, str, maxlen);
+ const char* stop = wcsnstr(whence, str, maxlen);
size_t n = stop == NULL ? wcsnlen(whence, maxlen) : (size_t)(stop - whence);
char* r = stop == NULL ? NULL : (whither + n);
wmemmove(whither, whence, n);