Finish removal of iconv_convenience in public API's.

[mat/samba.git] / librpc / ndr / ndr_compression.c

diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c
index c73c3bb6faf7c8bd82e60d40fafc6694d3db3fb4..d291df5ad8c96aaf2f10ff82bf7f31ebce152d44 100644 (file)
--- a/librpc/ndr/ndr_compression.c
+++ b/librpc/ndr/ndr_compression.c
@@ -391,7 +391,7 @@ enum ndr_err_code ndr_pull_compression_start(struct ndr_pull *subndr,
        bool last = false;
        z_stream z;
 
-       ndrpush = ndr_push_init_ctx(subndr, subndr->iconv_convenience);
+       ndrpush = ndr_push_init_ctx(subndr);
        NDR_ERR_HAVE_NO_MEMORY(ndrpush);
 
        switch (compression_alg) {
@@ -431,8 +431,6 @@ enum ndr_err_code ndr_pull_compression_start(struct ndr_pull *subndr,
        comndr->data_size       = uncompressed.length;
        comndr->offset          = 0;
 
-       comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience);
-
        *_comndr = comndr;
        return NDR_ERR_SUCCESS;
 }
@@ -465,7 +463,7 @@ enum ndr_err_code ndr_push_compression_start(struct ndr_push *subndr,
                                      compression_alg);
        }
 
-       uncomndr = ndr_push_init_ctx(subndr, subndr->iconv_convenience);
+       uncomndr = ndr_push_init_ctx(subndr);
        NDR_ERR_HAVE_NO_MEMORY(uncomndr);
        uncomndr->flags = subndr->flags;
 
@@ -492,8 +490,6 @@ enum ndr_err_code ndr_push_compression_end(struct ndr_push *subndr,
        ndrpull->data_size      = uncomndr->offset;
        ndrpull->offset         = 0;
 
-       ndrpull->iconv_convenience = talloc_reference(ndrpull, subndr->iconv_convenience);
-
        switch (compression_alg) {
        case NDR_COMPRESSION_MSZIP:
                ZERO_STRUCT(z);