summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-02-19 23:46:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:10:48 -0500
commit840bb19dcd0f4929396109f629b24dc4165dec7d (patch)
tree0469b608c4d37f61ec59d59aa7e7637af3b49ce1 /source4
parentb0fc1bfbcbacc61350fdd6e96306fe49d7fc0d6f (diff)
downloadsamba-840bb19dcd0f4929396109f629b24dc4165dec7d.tar.gz
samba-840bb19dcd0f4929396109f629b24dc4165dec7d.tar.bz2
samba-840bb19dcd0f4929396109f629b24dc4165dec7d.zip
r5463: Make need_wire_pointer() return the number of required
pointers rather then a bool. (This used to be commit d40a49c8a7ea85335383144b18b1ecfddc0c4ae0)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/ndr.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm
index cc11fdec86..f953445e89 100644
--- a/source4/build/pidl/ndr.pm
+++ b/source4/build/pidl/ndr.pm
@@ -166,15 +166,15 @@ sub array_type($)
sub need_wire_pointer($)
{
my $e = shift;
- my $pt;
-
- return 0 unless ($pt = pointer_type($e));
- if ($pt ne "ref") {
- return 1;
- } else {
- return 0;
+ my $n = $e->{POINTERS};
+ my $pt = pointer_type($e);
+
+ if (defined($pt) and $pt eq "ref") {
+ $n--;
}
+
+ return $n;
}
# determine if an element is a pure scalar. pure scalars do not