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 00dbab84ad673365c792b97239179f6b4a926f4f..3635759ac51def7b4989fc95bbd36ebb60c18eea 100644 (file)
--- 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 32ba97aaa4da68ed7fe00313dd63a692d260def8..1fa2c5c8cfc5c1df2cd1ff3e73cb9e9a14d78532 100644 (file)
--- 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