From 5a992f1c5b1aea74470f18ae5d104b313b27a957 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 19 Mar 2009 19:11:15 +1100
Subject: [PATCH] s3:charcnv Remove unused ucs2_to_unistr2()

---
 source3/include/proto.h   |  1 -
 source3/lib/util_unistr.c | 46 ---------------------------------------
 2 files changed, 47 deletions(-)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1bc9ec14978..77dcaf72e14 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1597,7 +1597,6 @@ 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);
-UNISTR2* ucs2_to_unistr2(TALLOC_CTX *ctx, UNISTR2* dst, smb_ucs2_t* 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 840e8e06da7..178bbc7e94e 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -1003,52 +1003,6 @@ int unistrcpy(uint16 *dst, uint16 *src)
 	return num_wchars;
 }
 
-/**
- * Samba ucs2 type to UNISTR2 conversion
- *
- * @param ctx Talloc context to create the dst strcture (if null) and the 
- *            contents of the unicode string.
- * @param dst UNISTR2 destination. If equals null, then it's allocated.
- * @param src smb_ucs2_t source.
- * @param max_len maximum number of unicode characters to copy. If equals
- *        null, then null-termination of src is taken
- *
- * @return copied UNISTR2 destination
- **/
-
-UNISTR2* ucs2_to_unistr2(TALLOC_CTX *ctx, UNISTR2* dst, smb_ucs2_t* src)
-{
-	size_t len;
-
-	if (!src) {
-		return NULL;
-	}
-
-	len = strlen_w(src);
-	
-	/* allocate UNISTR2 destination if not given */
-	if (!dst) {
-		dst = TALLOC_P(ctx, UNISTR2);
-		if (!dst)
-			return NULL;
-	}
-	if (!dst->buffer) {
-		dst->buffer = TALLOC_ARRAY(ctx, uint16, len + 1);
-		if (!dst->buffer)
-			return NULL;
-	}
-	
-	/* set UNISTR2 parameters */
-	dst->uni_max_len = len + 1;
-	dst->offset = 0;
-	dst->uni_str_len = len;
-	
-	/* copy the actual unicode string */
-	strncpy_w(dst->buffer, src, dst->uni_max_len);
-	
-	return dst;
-}
-
 /*************************************************************
  ascii only toupper - saves the need for smbd to be in C locale.
 *************************************************************/
-- 
2.34.1