summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-12 15:25:04 +1000
committerAndrew Tridgell <tridge@samba.org>2011-04-13 14:47:07 +1000
commitc8a5fa3fa938e635327b1d65964ba599a92f233f (patch)
treeb646e4371bee22d308034b9610660eea137afdea
parentb6a8418ff6918e6c01d603f69e28167fbcd91dee (diff)
downloadsamba-c8a5fa3fa938e635327b1d65964ba599a92f233f.tar.gz
samba-c8a5fa3fa938e635327b1d65964ba599a92f233f.tar.bz2
samba-c8a5fa3fa938e635327b1d65964ba599a92f233f.zip
s3-charcnv: make pull_ucs2 static
Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/charcnv.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d17da5355e..56ebd00ca7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -99,7 +99,6 @@ size_t push_ucs2(const void *base_ptr, void *dest, const char *src, size_t dest_
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);
bool push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src,
size_t *converted_size);
bool pull_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 3fd574b985..6e5b606e64 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -971,7 +971,7 @@ bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
The resulting string in "dest" is always null terminated.
**/
-size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
+static 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 size = 0;
size_t ucs2_align_len = 0;