sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

fixed another problem with pointers to arrays in structures

Browse Source 
(This used to be commit cf880a83121421403db43ef87e95a5326e9c9cb8)
This commit is contained in:
Andrew Tridgell 2003-11-14 07:55:43 +00:00
parent e8a3825ebc
commit 565fd2da76
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/build/pidl/parser.pm
View File

@ -76,10 +76,12 @@ sub struct_alignment($)
#####################################################################
# parse an array - push side
sub ParseArrayPush($$)
sub ParseArrayPush($$$)
{
my $e = shift;
my $var_prefix = shift;
my $ndr_flags = shift;
my $size = find_size_var($e, util::array_size($e));
if (defined $e->{CONFORMANT_SIZE}) {
@ -113,10 +115,12 @@ sub ParseArrayPrint($$)
#####################################################################
# parse an array - pull side
sub ParseArrayPull($$)
sub ParseArrayPull($$$)
{
my $e = shift;
my $var_prefix = shift;
my $ndr_flags = shift;
my $size = find_size_var($e, util::array_size($e));
my $alloc_size = $size;
@ -150,7 +154,7 @@ sub ParseArrayPull($$)
if (util::is_scalar_type($e->{TYPE})) {
$res .= "\t\tNDR_CHECK(ndr_pull_array_$e->{TYPE}(ndr, $var_prefix$e->{NAME}, $size));\n";
} else {
$res .= "\t\tNDR_CHECK(ndr_pull_array(ndr, ndr_flags, (void **)$var_prefix$e->{NAME}, sizeof($var_prefix$e->{NAME}\[0]), $size, (ndr_pull_flags_fn_t)ndr_pull_$e->{TYPE}));\n";
$res .= "\t\tNDR_CHECK(ndr_pull_array(ndr, $ndr_flags, (void **)$var_prefix$e->{NAME}, sizeof($var_prefix$e->{NAME}\[0]), $size, (ndr_pull_flags_fn_t)ndr_pull_$e->{TYPE}));\n";
}
}
@ -296,7 +300,7 @@ sub ParseElementPushBuffer($$$)
}
if (util::array_size($e)) {
ParseArrayPush($e, "r->");
ParseArrayPush($e, "r->", "NDR_SCALARS|NDR_BUFFERS");
} elsif (my $switch = util::has_property($e, "switch_is")) {
if ($e->{POINTERS}) {
ParseElementPushSwitch($e, $var_prefix, "NDR_BUFFERS|NDR_SCALARS", $switch);
@ -362,7 +366,7 @@ sub ParseElementPullBuffer($$$)
}
if (util::array_size($e)) {
ParseArrayPull($e, "r->");
ParseArrayPull($e, "r->", "NDR_SCALARS|NDR_BUFFERS");
} elsif (my $switch = util::has_property($e, "switch_is")) {
if ($e->{POINTERS}) {
ParseElementPullSwitch($e, $var_prefix, "NDR_SCALARS|NDR_BUFFERS", $switch);
@ -771,7 +775,7 @@ sub ParseFunctionPush($)
if (!util::is_scalar_type($e->{TYPE})) {
$res .= "\t\tint ndr_flags = NDR_SCALARS|NDR_BUFFERS;\n";
}
ParseArrayPush($e, "r->in.");
ParseArrayPush($e, "r->in.", "ndr_flags");
$res .= "\t}\n";
} else {
ParseElementPushScalar($e, "r->in.", "NDR_SCALARS|NDR_BUFFERS");
@ -809,7 +813,7 @@ sub ParseFunctionPull($)
if (!util::is_scalar_type($e->{TYPE})) {
$res .= "\t\tint ndr_flags = NDR_SCALARS|NDR_BUFFERS;\n";
}
ParseArrayPull($e, "r->out.");
ParseArrayPull($e, "r->out.", "ndr_flags");
$res .= "\t}\n";
} else {
ParseElementPullScalar($e, "r->out.", "NDR_SCALARS|NDR_BUFFERS");