diff options
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/lib/charcnv.c | 39 |
2 files changed, 0 insertions, 43 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 718c6b400b..b8ba8c03ad 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -375,11 +375,8 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx, 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); -bool pull_ucs2_allocate(char **dest, const smb_ucs2_t *src, - size_t *converted_size); bool pull_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src, size_t *converted_size); -bool pull_utf8_allocate(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, @@ -1831,7 +1828,6 @@ ADS_STATUS ads_do_search_all_fn(ADS_STRUCT *ads, const char *bind_path, int scope, const char *expr, const char **attrs, bool (*fn)(ADS_STRUCT *, char *, void **, void *), void *data_area); -void ads_memfree(ADS_STRUCT *ads, void *mem); char *ads_parent_dn(const char *dn); ADS_MODLIST ads_init_mods(TALLOC_CTX *ctx); ADS_STATUS ads_mod_str(TALLOC_CTX *ctx, ADS_MODLIST *mods, diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index ab00209a8e..567ee7b8d1 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -1520,26 +1520,6 @@ bool pull_ucs2_talloc(TALLOC_CTX *ctx, char **dest, const smb_ucs2_t *src, } /** - * Copy a string from a UCS2 src to a unix char * destination, allocating a buffer - * - * @param dest always set at least to NULL - * @parm converted_size set to the number of bytes occupied by the string in - * the destination on success. - * @return true if new buffer was correctly allocated, and string was - * converted. - **/ - -bool pull_ucs2_allocate(char **dest, const smb_ucs2_t *src, - size_t *converted_size) -{ - size_t src_len = (strlen_w(src)+1) * sizeof(smb_ucs2_t); - - *dest = NULL; - return convert_string_allocate(NULL, CH_UTF16LE, CH_UNIX, src, src_len, - (void **)dest, converted_size, True); -} - -/** * Copy a string from a UTF-8 src to a unix char * destination, allocating a buffer using talloc * * @param dest always set at least to NULL @@ -1560,25 +1540,6 @@ bool pull_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src, (void **)dest, converted_size, True); } -/** - * Copy a string from a UTF-8 src to a unix char * destination, allocating a buffer - * - * @param dest always set at least to NULL - * @parm converted_size set to the number of bytes occupied by the string in - * the destination on success. - * - * @return true if new buffer was correctly allocated, and string was - * converted. - **/ - -bool pull_utf8_allocate(char **dest, const char *src, size_t *converted_size) -{ - size_t src_len = strlen(src)+1; - - *dest = NULL; - return convert_string_allocate(NULL, CH_UTF8, CH_UNIX, src, src_len, - (void **)dest, converted_size, True); -} /** * Copy a string from a DOS src to a unix char * destination, allocating a buffer using talloc |