s3:charcnv remove now unused malloc() based conversion functions

diff --git a/source3/include/ads_protos.h b/source3/include/ads_protos.h
index a372010b796e91c0231381975db1105c0b9ebabc..502eaa82d9756d5d2f95eea509ebcff0f57c127e 100644 (file)
--- a/source3/include/ads_protos.h
+++ b/source3/include/ads_protos.h
@@ -3,7 +3,7 @@
  */
 
 void ads_msgfree(ADS_STRUCT *ads, LDAPMessage *msg);
-char *ads_get_dn(ADS_STRUCT *ads, LDAPMessage *msg);
+char *ads_get_dn(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg);
 char *ads_get_dn_canonical(ADS_STRUCT *ads, LDAPMessage *msg);
 
 char *ads_pull_string(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg,

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 52d9d6b359f3922eb91eff555d3ea6ca715af68f..1ea6f8d246238c573e49e3de0ab5abbb30b09bd0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -374,11 +374,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 6037dcc94253988060262aaa17a37f4d42a00ccd..2bf1e6f062e5df9d06a3329aab55ac44cdc4e06b 100644 (file)
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -626,46 +626,6 @@ size_t pull_ucs2_fstring(char *dest, const void *src)
        return pull_ucs2(NULL, dest, src, sizeof(fstring), -1, STR_TERMINATE);
 }
 
-/**
- * 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(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
- *
- * @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(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
  *