summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-19 19:20:08 +1100
committerGünther Deschner <gd@samba.org>2009-04-07 20:51:56 +0200
commit0c22d55134b39a6bc983b4f852f623a51af4d362 (patch)
tree1a2af9fd71978e2bc1a7c0b5abb691db347babfb
parent3277b19800c6c56a32b7641d293e496475d8c62a (diff)
downloadsamba-0c22d55134b39a6bc983b4f852f623a51af4d362.tar.gz
samba-0c22d55134b39a6bc983b4f852f623a51af4d362.tar.bz2
samba-0c22d55134b39a6bc983b4f852f623a51af4d362.zip
s3:charcnv Remove unused unistrcpy() and unistrlen()
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/lib/util_unistr.c37
2 files changed, 0 insertions, 39 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7ae008511c..f8a28ef165 100644
--- 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 3a6971dcce..7d80b3cdea 100644
--- 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.
*************************************************************/