summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-01-26 06:51:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:13 -0500
commit65a9f77d3f0e0dc40d5b9dfc851559ec93a08d87 (patch)
tree9f1c9c117ba159a6885438a27e5a0229967f2497
parent27cb4d4672268d3c1b57494e892dbac3d38d5b54 (diff)
downloadsamba-65a9f77d3f0e0dc40d5b9dfc851559ec93a08d87.tar.gz
samba-65a9f77d3f0e0dc40d5b9dfc851559ec93a08d87.tar.bz2
samba-65a9f77d3f0e0dc40d5b9dfc851559ec93a08d87.zip
r5009: Put bitmaps in their own subtree.
(This used to be commit 8ca1e3aa3b5007f9da3e951e15e0380ae170a1cf)
-rw-r--r--source4/build/pidl/eparser.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm
index 8075e42cb9..ab8904ab9d 100644
--- a/source4/build/pidl/eparser.pm
+++ b/source4/build/pidl/eparser.pm
@@ -319,6 +319,8 @@ sub NeededTypedef($)
'bitmask' => "$2"
};
}
+
+ $needed{"ett_$t->{NAME}"} = 1;
}
}
@@ -645,10 +647,13 @@ sub RewriteC($$$)
pidl $_;
if (defined($bitmaps{$cur_fn})) {
+ pidl "\t{\n\t\tproto_tree *subtree = NULL;\n\n";
+ pidl "\t\tif (tree->proto_tree)\n\t\t\tsubtree = proto_item_add_subtree(tree->proto_tree->last_child, ett_$cur_fn);\n\n";
foreach my $e (@{$bitmaps{$cur_fn}->{DATA}{ELEMENTS}}) {
$e =~ /^(.*?) \( (.*?) \)$/;
- pidl "\tproto_tree_add_boolean(tree->proto_tree, hf_${cur_fn}_$1, ndr->tvb, ndr->offset - sizeof(v), sizeof(v), v);\n";
+ pidl "\t\tproto_tree_add_boolean(subtree, hf_${cur_fn}_$1, ndr->tvb, ndr->offset - sizeof(v), sizeof(v), v);\n";
}
+ pidl "\t}\n";
}
next;