From 3ceb353939e4c67b41cde5af1e7f261cd697b2e6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 24 Mar 2011 12:09:03 +1100 Subject: s3-lib: make pull_ucs2_base_talloc static it is local to charcnv.c --- source3/include/proto.h | 6 ------ source3/lib/charcnv.c | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index 3c454460f2..e797b14b16 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -434,12 +434,6 @@ 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); size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_len, size_t src_len, int flags); -size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx, - const void *base_ptr, - char **ppdest, - const void *src, - size_t src_len, - int flags); size_t pull_ucs2_fstring(char *dest, const void *src); bool push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src, size_t *converted_size); diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index d2633bd8ad..1f698c6288 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -1014,12 +1014,12 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_ The resulting string in "dest" is always null terminated. **/ -size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx, - const void *base_ptr, - char **ppdest, - const void *src, - size_t src_len, - int flags) +static size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx, + const void *base_ptr, + char **ppdest, + const void *src, + size_t src_len, + int flags) { char *dest; size_t dest_len; -- cgit