s3-lib Remove more unused fstring.c functions

Signed-off-by: Andrew Tridgell <tridge@samba.org>

2 files changed, 0 insertions, 47 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 56ebd00ca7..4618dfaf11 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -96,7 +96,6 @@ size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
 size_t pull_ascii_fstring(char *dest, const void *src);
 size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src);
 size_t push_ucs2(const void *base_ptr, void *dest, const char *src, size_t dest_len, int flags);
-size_t push_utf8_fstring(void *dest, const char *src);
 bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
 		      size_t *converted_size);
 bool push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src,
diff --git a/source3/lib/fstring.c b/source3/lib/fstring.c
index daf4f7ba34..7ac50ece15 100644
--- a/source3/lib/fstring.c
+++ b/source3/lib/fstring.c
@@ -62,49 +62,3 @@ size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src)
 	return pull_ascii(dest, src, dest_len, sizeof(nstring), STR_TERMINATE);
 }
 
-/**
- Copy a string from a char* src to a UTF-8 destination.
- Return the number of bytes occupied by the string in the destination
- Flags can have:
-  STR_TERMINATE means include the null termination
-  STR_UPPER     means uppercase in the destination
- dest_len is the maximum length allowed in the destination. If dest_len
- is -1 then no maxiumum is used.
-**/
-
-static size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags)
-{
-	size_t src_len = 0;
-	size_t size = 0;
-	bool ret;
-	char *tmpbuf = NULL;
-
-	if (dest_len == (size_t)-1) {
-		/* No longer allow dest_len of -1. */
-		smb_panic("push_utf8 - invalid dest_len of -1");
-	}
-
-	if (flags & STR_UPPER) {
-		tmpbuf = strupper_talloc(talloc_tos(), src);
-		if (!tmpbuf) {
-			return (size_t)-1;
-		}
-		src = tmpbuf;
-		src_len = strlen(src);
-	}
-
-	src_len = strlen(src);
-	if (flags & STR_TERMINATE) {
-		src_len++;
-	}
-
-	ret = convert_string(CH_UNIX, CH_UTF8, src, src_len, dest, dest_len, &size);
-	TALLOC_FREE(tmpbuf);
-	return ret ? size : (size_t)-1;
-}
-
-size_t push_utf8_fstring(void *dest, const char *src)
-{
-	return push_utf8(dest, src, sizeof(fstring), STR_TERMINATE);
-}
-