From: Jeremy Allison <jra@samba.org>
Date: Tue, 21 Aug 2012 22:48:38 +0000 (-0700)
Subject: Remove align_string(). No longer used.
X-Git-Tag: samba-4.0.0beta7~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63ea42853cbc6cdfec4fe6f8aea8b717e889237c;p=thirdparty%2Fsamba.git

Remove align_string(). No longer used.

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Aug 22 20:38:50 CEST 2012 on sn-devel-104
---

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 00dbab84ad6..3635759ac51 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -83,7 +83,6 @@ size_t pull_string_talloc(TALLOC_CTX *ctx,
 			const void *src,
 			size_t src_len,
 			int flags);
-size_t align_string(const void *base_ptr, const char *p, int flags);
 size_t dos_PutUniCode(char *dst,const char *src, size_t len, bool null_terminate);
 int rpcstr_push_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src);
 
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 32ba97aaa4d..1fa2c5c8cfc 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -494,17 +494,6 @@ size_t pull_string_talloc(TALLOC_CTX *ctx,
 					flags);
 }
 
-
-size_t align_string(const void *base_ptr, const char *p, int flags)
-{
-	if (!(flags & STR_ASCII) && \
-	    ((flags & STR_UNICODE || \
-	      (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
-		return ucs2_align(base_ptr, p, flags);
-	}
-	return 0;
-}
-
 /*******************************************************************
  Write a string in (little-endian) unicode format. src is in
  the current DOS codepage. len is the length in bytes of the