Revert accidental reintroduction of void ** bug.

diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 258730ec821ac79dea8fa48889fc111374424cb3..94d47a9f7f098b9f9f7bee3d60d1581d78d69f77 100644 (file)
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -169,9 +169,10 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic,
 _PUBLIC_ ssize_t iconv_talloc(TALLOC_CTX *ctx, 
                                       smb_iconv_t cd,
                                       void const *src, size_t srclen, 
 _PUBLIC_ ssize_t iconv_talloc(TALLOC_CTX *ctx, 
                                       smb_iconv_t cd,
                                       void const *src, size_t srclen, 

-                                      void **dest)
+                                      void *dst)

 {
        size_t i_len, o_len, destlen;
 {
        size_t i_len, o_len, destlen;

+       void **dest = (void **)dst;

        size_t retval;
        const char *inbuf = (const char *)src;
        char *outbuf, *ob;
        size_t retval;
        const char *inbuf = (const char *)src;
        char *outbuf, *ob;


@@ -314,9 +315,10 @@ _PUBLIC_ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
                                       struct smb_iconv_convenience *ic, 
                                       charset_t from, charset_t to, 
                                       void const *src, size_t srclen, 
                                       struct smb_iconv_convenience *ic, 
                                       charset_t from, charset_t to, 
                                       void const *src, size_t srclen, 

-                                      void **dest, size_t *converted_size, 
+                                      void *dst, size_t *converted_size, 

                                           bool allow_badcharcnv)
 {
                                           bool allow_badcharcnv)
 {

+       void **dest = (void **)dst;

        smb_iconv_t descriptor;
        ssize_t ret;
 
        smb_iconv_t descriptor;
        ssize_t ret;
 

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 655bae7bcdae4cbaf7dfb74d7da9add348e2a1ea..37c5acafafa105614ad0120939c5fc8c46aa0fd1 100644 (file)
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -136,7 +136,7 @@ ssize_t pull_string(char *dest, const void *src, size_t dest_len, size_t src_len
 bool convert_string_talloc(TALLOC_CTX *ctx, 
                                       charset_t from, charset_t to, 
                                       void const *src, size_t srclen, 
 bool convert_string_talloc(TALLOC_CTX *ctx, 
                                       charset_t from, charset_t to, 
                                       void const *src, size_t srclen, 

-                                      void **dest, size_t *converted_size, 
+                                      void *dest, size_t *converted_size, 

                                           bool allow_badcharcnv);
 
 size_t convert_string(charset_t from, charset_t to,
                                           bool allow_badcharcnv);
 
 size_t convert_string(charset_t from, charset_t to,


@@ -146,7 +146,7 @@ size_t convert_string(charset_t from, charset_t to,
 ssize_t iconv_talloc(TALLOC_CTX *mem_ctx, 
                                       smb_iconv_t cd,
                                       void const *src, size_t srclen, 
 ssize_t iconv_talloc(TALLOC_CTX *mem_ctx, 
                                       smb_iconv_t cd,
                                       void const *src, size_t srclen, 

-                                      void **dest);
+                                      void *dest);

 
 extern struct smb_iconv_convenience *global_iconv_convenience;
 
 
 extern struct smb_iconv_convenience *global_iconv_convenience;
 


@@ -176,7 +176,7 @@ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
                                       struct smb_iconv_convenience *ic, 
                                       charset_t from, charset_t to, 
                                       void const *src, size_t srclen, 
                                       struct smb_iconv_convenience *ic, 
                                       charset_t from, charset_t to, 
                                       void const *src, size_t srclen, 

-                                      void **dest, size_t *converted_size, bool allow_badcharcnv);
+                                      void *dest, size_t *converted_size, bool allow_badcharcnv);

 /* iconv */
 smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode);
 int smb_iconv_close(smb_iconv_t cd);
 /* iconv */
 smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode);
 int smb_iconv_close(smb_iconv_t cd);

diff --git a/source3/include/proto.h b/source3/include/proto.h
index ffdef43d192522da7ee33bbb5044c571ad96e1e4..95806d2d9dcd8c27888568511cb8fddcfc538d00 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -347,9 +347,6 @@ size_t convert_string(charset_t from, charset_t to,
 bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
                             void const *src, size_t srclen, void *dst,
                             size_t *converted_size, bool allow_bad_conv);
 bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
                             void const *src, size_t srclen, void *dst,
                             size_t *converted_size, bool allow_bad_conv);

-bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
-                          void const *src, size_t srclen, void **dst,
-                          size_t *converted_size, bool allow_bad_conv);

 size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen);
 char *strdup_upper(const char *s);
 char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s);
 size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen);
 char *strdup_upper(const char *s);
 char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s);

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 81cb9a50948d9c5337841a01f06a38bb8fd927a0..c3b345142f528804a42c28a9744700e1da205526 100644 (file)
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -763,7 +763,7 @@ bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
  * converted.
  */
 bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
  * converted.
  */
 bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,

-                          void const *src, size_t srclen, void **dst,
+                          void const *src, size_t srclen, void *dst,

                           size_t *converted_size, bool allow_bad_conv)
 {
        void **dest = (void **)dst;
                           size_t *converted_size, bool allow_bad_conv)
 {
        void **dest = (void **)dst;