diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-06-24 01:18:56 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:44 -0500 |
commit | 152a6a00c31f52d14a63bfc977ac54713c56c9cd (patch) | |
tree | 82a0b1a45404f08f32b647a47b7c332469650fc8 /source4/build/pidl/ndr_header.pm | |
parent | d60b11c1f0151dbd758b896ba2934a8efa4ada75 (diff) | |
download | samba-152a6a00c31f52d14a63bfc977ac54713c56c9cd.tar.gz samba-152a6a00c31f52d14a63bfc977ac54713c56c9cd.tar.bz2 samba-152a6a00c31f52d14a63bfc977ac54713c56c9cd.zip |
r7865: changed pidl to take a "const void *" instead of a "void *" for the
structure in ndr_push_*() and ndr_print_*(). The push and print
functions really should not modify the structure.
metze, to make this work I had to change your spoolss hand
marshaller. Can you please check it is OK? I think that the IN and OUT
sides of that function are not ever called on the same structure, so I
think that attempt at remembering the value by assigning to
r->in._offered was not doing anything anyway, but please correct me if
I have misunderstood it.
If you really do need to remember something on those structures I'd
suggest the ndr_token_store() and ndr_token_retrieve() functions,
which are used by pidl for just this sort of thing.
(This used to be commit eee528be97fa43ca53bdc5652b4d29a0a2caf563)
Diffstat (limited to 'source4/build/pidl/ndr_header.pm')
-rw-r--r-- | source4/build/pidl/ndr_header.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/pidl/ndr_header.pm b/source4/build/pidl/ndr_header.pm index 6269320115..33183cec96 100644 --- a/source4/build/pidl/ndr_header.pm +++ b/source4/build/pidl/ndr_header.pm @@ -361,7 +361,7 @@ sub HeaderFnProto($$) my ($interface,$fn) = @_; my $name = $fn->{NAME}; - pidl "void ndr_print_$name(struct ndr_print *ndr, const char *name, int flags, struct $name *r);\n"; + pidl "void ndr_print_$name(struct ndr_print *ndr, const char *name, int flags, const struct $name *r);\n"; if (defined($fn->{OPNUM})) { pidl "NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);\n"; @@ -370,7 +370,7 @@ sub HeaderFnProto($$) return unless util::has_property($fn, "public"); - pidl "NTSTATUS ndr_push_$name(struct ndr_push *ndr, int flags, struct $name *r);\n"; + pidl "NTSTATUS ndr_push_$name(struct ndr_push *ndr, int flags, const struct $name *r);\n"; pidl "NTSTATUS ndr_pull_$name(struct ndr_pull *ndr, int flags, struct $name *r);\n"; pidl "\n"; |