consolidate str[n]casecmp_l into str[n]casecmp source files

this is mainly done for consistency with the ctype functions and to
declutter the src/locale directory.

diff --git a/src/locale/strcasecmp_l.c b/src/locale/strcasecmp_l.c
deleted file mode 100644 (file)
index ca80543..0000000
--- a/src/locale/strcasecmp_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <strings.h>
-
-int strcasecmp_l(const char *l, const char *r, locale_t loc)
-{
-       return strcasecmp(l, r);
-}

diff --git a/src/locale/strncasecmp_l.c b/src/locale/strncasecmp_l.c
deleted file mode 100644 (file)
index af33ada..0000000
--- a/src/locale/strncasecmp_l.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <strings.h>
-#include <locale.h>
-
-int strncasecmp_l(const char *l, const char *r, size_t n, locale_t loc)
-{
-       return strncasecmp(l, r, n);
-}

diff --git a/src/string/strcasecmp.c b/src/string/strcasecmp.c
index 02fd5f8ca499267b1b6420fd6c4fc2aa007ae56f..3cd5f2d0243e5b5ce5048282e03321763509db67 100644 (file)
--- a/src/string/strcasecmp.c
+++ b/src/string/strcasecmp.c
@@ -1,5 +1,6 @@
 #include <strings.h>
 #include <ctype.h>
+#include "libc.h"
 
 int strcasecmp(const char *_l, const char *_r)
 {
@@ -7,3 +8,10 @@ int strcasecmp(const char *_l, const char *_r)
        for (; *l && *r && (*l == *r || tolower(*l) == tolower(*r)); l++, r++);
        return tolower(*l) - tolower(*r);
 }
+
+int __strcasecmp_l(const char *l, const char *r, locale_t loc)
+{
+       return strcasecmp(l, r);
+}
+
+weak_alias(__strcasecmp_l, strcasecmp_l);

diff --git a/src/string/strncasecmp.c b/src/string/strncasecmp.c
index 24659721d7c5e52d3423b53c38c678304a7fafa6..3af5300878a45c2ef78e1063736be9b4de18fd8f 100644 (file)
--- a/src/string/strncasecmp.c
+++ b/src/string/strncasecmp.c
@@ -1,5 +1,6 @@
 #include <strings.h>
 #include <ctype.h>
+#include "libc.h"
 
 int strncasecmp(const char *_l, const char *_r, size_t n)
 {
@@ -8,3 +9,10 @@ int strncasecmp(const char *_l, const char *_r, size_t n)
        for (; *l && *r && n && (*l == *r || tolower(*l) == tolower(*r)); l++, r++, n--);
        return tolower(*l) - tolower(*r);
 }
+
+int __strncasecmp_l(const char *l, const char *r, size_t n, locale_t loc)
+{
+       return strncasecmp(l, r, n);
+}
+
+weak_alias(__strncasecmp_l, strncasecmp_l);