summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-24 12:09:03 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-25 04:37:06 +0100
commit3ceb353939e4c67b41cde5af1e7f261cd697b2e6 (patch)
tree77e8fd52a25a2cd2879f7bc8e53caa2109148e7b
parent980064b76d774680febc5d201a1aacc4b9fa8b86 (diff)
downloadsamba-3ceb353939e4c67b41cde5af1e7f261cd697b2e6.tar.gz
samba-3ceb353939e4c67b41cde5af1e7f261cd697b2e6.tar.bz2
samba-3ceb353939e4c67b41cde5af1e7f261cd697b2e6.zip
s3-lib: make pull_ucs2_base_talloc static
it is local to charcnv.c
-rw-r--r--source3/include/proto.h6
-rw-r--r--source3/lib/charcnv.c12
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;