diff options
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/charcnv.c | 11 | 
2 files changed, 0 insertions, 12 deletions
| diff --git a/source3/include/proto.h b/source3/include/proto.h index 00dbab84ad..3635759ac5 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 32ba97aaa4..1fa2c5c8cf 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 | 
