s3:charcnv Remove unused unistrcpy() and unistrlen()

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7ae008511ca83c0c38a6051172c2c49f2358c944..f8a28ef1650b66a492d9aab2ebdac947eeeae620 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1595,8 +1595,6 @@ int strcmp_wa(const smb_ucs2_t *a, const char *b);
 int strncmp_wa(const smb_ucs2_t *a, const char *b, size_t len);
 smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p);
 smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins);
-int unistrlen(uint16 *s);
-int unistrcpy(uint16 *dst, uint16 *src);
 int toupper_ascii(int c);
 int tolower_ascii(int c);
 int isupper_ascii(int c);

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 3a6971dcce58e08254fded2e64ffcae82c3bfd9d..7d80b3cdea26ed396a4f308dd285630d53dcc2c3 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -850,43 +850,6 @@ smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins)
        return NULL;
 }
 
-/*******************************************************************
- Returns the length in number of wide characters.
-******************************************************************/
-
-int unistrlen(uint16 *s)
-{
-       int len;
-
-       if (!s) {
-               return -1;
-       }
-
-       for (len=0; SVAL(s,0); s++,len++) {
-               ;
-       }
-
-       return len;
-}
-
-/*******************************************************************
- Strcpy for unicode strings. Returns length (in num of wide chars).
- Not odd align safe.
-********************************************************************/
-
-int unistrcpy(uint16 *dst, uint16 *src)
-{
-       int num_wchars = 0;
-
-       while (SVAL(src,0)) {
-               *dst++ = *src++;
-               num_wchars++;
-       }
-       *dst = 0;
-
-       return num_wchars;
-}
-
 /*************************************************************
  ascii only toupper - saves the need for smbd to be in C locale.
 *************************************************************/