diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-09 17:20:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:30 +0200 |
| commit | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch) | |
| tree | 9a0a6cb6617d855c28eb891396898096c4214e88 /librpc/ndr/ndr_compression.c | |
| parent | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff) | |
| download | samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.bz2 samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip | |
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'librpc/ndr/ndr_compression.c')
| -rw-r--r-- | librpc/ndr/ndr_compression.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c index c73c3bb6fa..d291df5ad8 100644 --- 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); |