summaryrefslogtreecommitdiff
path: root/source3/include/proto.h
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-28 11:41:31 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-28 05:30:20 +0200
commit0df4061cffd32d4a989c5fd177136c2cc3730e7c (patch)
tree9fe0a4411d4079072458801a9ad4825930801f51 /source3/include/proto.h
parentea95e0967b33d75acc960b5308a667e956ba4f29 (diff)
downloadsamba-0df4061cffd32d4a989c5fd177136c2cc3730e7c.tar.gz
samba-0df4061cffd32d4a989c5fd177136c2cc3730e7c.tar.bz2
samba-0df4061cffd32d4a989c5fd177136c2cc3730e7c.zip
lib/util/charset Merge talloc-based pull and push charset functions
These were copied from source3/lib/charcnv.c Andrew Bartlett
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r--source3/include/proto.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2a1e1389a6..27a8990e20 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -94,16 +94,6 @@ size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
size_t pull_ascii_fstring(char *dest, const void *src);
size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src);
size_t push_ucs2(const void *base_ptr, void *dest, const char *src, size_t dest_len, int flags);
-bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
- size_t *converted_size);
-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,
- size_t *converted_size);
-bool pull_ucs2_talloc(TALLOC_CTX *ctx, char **dest, const smb_ucs2_t *src,
- size_t *converted_size);
-bool pull_ascii_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
- size_t *converted_size);
size_t push_string_check_fn(void *dest, const char *src,
size_t dest_len, int flags);
size_t push_string_base(const char *base, uint16 flags2,