Simplify strcoll()/strxfrm()/wcscoll()/wcsxfrm().
Also duplicate the existing string tests for the wcs functions.
Change-Id: Ic110374e5704c85b0a47e0d962d3e51e6365cc24
diff --git a/libc/bionic/string_l.cpp b/libc/bionic/string_l.cpp
index 84396bf..1d60ad8 100644
--- a/libc/bionic/string_l.cpp
+++ b/libc/bionic/string_l.cpp
@@ -29,10 +29,12 @@
#include <string.h>
#include <xlocale.h>
-int strcoll_l(const char* s1, const char* s2, locale_t) {
- return strcoll(s1, s2);
+int strcoll(const char* lhs, const char* rhs) {
+ return strcmp(lhs, rhs);
}
+__strong_alias(strcoll_l, strcoll);
-size_t strxfrm_l(char* dst, const char* src, size_t n, locale_t) {
- return strxfrm(dst, src, n);
+size_t strxfrm(char* dst, const char* src, size_t n) {
+ return strlcpy(dst, src, n);
}
+__strong_alias(strxfrm_l, strxfrm);
diff --git a/libc/bionic/wchar_l.cpp b/libc/bionic/wchar_l.cpp
index 9840246..503d264 100644
--- a/libc/bionic/wchar_l.cpp
+++ b/libc/bionic/wchar_l.cpp
@@ -29,10 +29,12 @@
#include <wchar.h>
#include <xlocale.h>
-int wcscoll_l(const wchar_t* ws1, const wchar_t* ws2, locale_t) {
- return wcscoll(ws1, ws2);
+int wcscoll(const wchar_t* lhs, const wchar_t* rhs) {
+ return wcscmp(lhs, rhs);
}
+__strong_alias(wcscoll_l, wcscoll);
-size_t wcsxfrm_l(wchar_t* dst, const wchar_t* src, size_t n, locale_t) {
- return wcsxfrm(dst, src, n);
+size_t wcsxfrm(wchar_t* dst, const wchar_t* src, size_t n) {
+ return wcslcpy(dst, src, n);
}
+__strong_alias(wcsxfrm_l, wcsxfrm);