Pick up change from Samba: commit d62eb3cc9f97b203d21ec6e75c48c739a43bc163 Author: Stefan Metzmacher <metze@samba.org> Date: Wed Feb 22 10:08:46 2017 +0100 pidl:Python: make sure print HASH references for STRUCT types BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Change-Id: Ieef766844ce66160eaaacecc73a51f94f69319fb Reviewed-on: https://code.wireshark.org/review/23717 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
5bda9bd4cb
commit
75f78cd49a
|
@ -245,12 +245,18 @@ sub PythonStruct($$$$$$)
|
||||||
$self->pidl("static PyGetSetDef ".$getsetters."[] = {");
|
$self->pidl("static PyGetSetDef ".$getsetters."[] = {");
|
||||||
$self->indent;
|
$self->indent;
|
||||||
foreach my $e (@{$d->{ELEMENTS}}) {
|
foreach my $e (@{$d->{ELEMENTS}}) {
|
||||||
|
my $etype = "";
|
||||||
|
if (ref($e->{TYPE}) eq "HASH") {
|
||||||
|
$etype = $e->{TYPE}->{NAME};
|
||||||
|
} else {
|
||||||
|
$etype = $e->{TYPE};
|
||||||
|
}
|
||||||
$self->pidl("{");
|
$self->pidl("{");
|
||||||
$self->indent;
|
$self->indent;
|
||||||
$self->pidl(".name = discard_const_p(char, \"$e->{NAME}\"),");
|
$self->pidl(".name = discard_const_p(char, \"$e->{NAME}\"),");
|
||||||
$self->pidl(".get = py_$name\_get_$e->{NAME},");
|
$self->pidl(".get = py_$name\_get_$e->{NAME},");
|
||||||
$self->pidl(".set = py_$name\_set_$e->{NAME},");
|
$self->pidl(".set = py_$name\_set_$e->{NAME},");
|
||||||
$self->pidl(".doc = discard_const_p(char, \"PIDL-generated element of base type $e->{TYPE}\")");
|
$self->pidl(".doc = discard_const_p(char, \"PIDL-generated element of base type $etype\")");
|
||||||
$self->deindent;
|
$self->deindent;
|
||||||
$self->pidl("},");
|
$self->pidl("},");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue