s3-charcnv: make pull_ucs2 static

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d17da5355e36df16e380559da37405fbac0e998d..56ebd00ca7ec62c81e6b6649d8f576f2920d1710 100644 (file)
--- 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 3fd574b98539bc53ecfd1ab512d3e8df7bc85689..6e5b606e64dda15254422ece9aa3904d00fe31ad 100644 (file)
--- 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;