r4517: Revert previous commit about giving arrays of scalars their own subtree.

Generate code to display using proto_tree_add_bytes() instead.

diff --git a/source/build/pidl/eparser.pm b/source/build/pidl/eparser.pm
index a67aa0626d3627de88b7fbad23d6f13f505e6e12..0038f53123ca8e6fb0aba9876670351c1d914999 100644 (file)
--- a/source/build/pidl/eparser.pm
+++ b/source/build/pidl/eparser.pm
@@ -173,34 +173,38 @@ sub NeededTypedef($)
        if ($t->{DATA}->{TYPE} eq "STRUCT") {
 
            for my $e (@{$t->{DATA}->{ELEMENTS}}) {
-
                $e->{PARENT} = $t->{DATA};
-
                if ($needed{"pull_$t->{NAME}"}) {
                    $needed{"pull_$e->{TYPE}"} = 1;
                }
            
                if (util::is_scalar_type($e->{TYPE})) {
-
+               
                    if (defined($e->{ARRAY_LEN}) or 
                        util::has_property($e, "size_is")) {
 
-                       $needed{"ett_$e->{NAME}"} = 1;
+                       # Arrays of scalar types are FT_BYTES
+                   
+                       $needed{"hf_$e->{NAME}_$e->{TYPE}_array"} = {
+                           'name' => field2name($e->{NAME}),
+                           'type' => $e->{TYPE},
+                           'ft'   => "FT_BYTES",
+                           'base' => elementbase($e)
+                           };
 
                    } else {
-               
                        $needed{"hf_$e->{NAME}_$e->{TYPE}"} = {
                            'name' => field2name($e->{NAME}),
                            'type' => $e->{TYPE},
                            'ft'   => type2ft($e->{TYPE}),
                            'base' => elementbase($e)
                            };
-                       
-                       $e->{PARENT} = $t->{DATA};
-                       
-                       if ($needed{"pull_$t->{NAME}"}) {
-                           $needed{"pull_$e->{TYPE}"} = 1;
-                       }
+                   }
+                   
+                   $e->{PARENT} = $t->{DATA};
+                   
+                   if ($needed{"pull_$t->{NAME}"}) {
+                       $needed{"pull_$e->{TYPE}"} = 1;
                    }
 
                } else {
@@ -433,7 +437,7 @@ sub RewriteC($$$)
 
        s/(ndr_pull_array([^\(_]*?)\(ndr, (NDR_[^,]*?), ([^\)].*?)\);)/ndr_pull_array$2( ndr, $3, tree, $4);/smg;
 
-       s/(ndr_pull_array_([^\(]*?)\(ndr, (NDR_[^,]*?), (r->((in|out).)?([^,]*?)), (.*?)\);)/ndr_pull_array_$2( ndr, $3, get_subtree(tree, \"$7\", ndr, ett_$7), $4, $8);/smg;
+       s/(ndr_pull_array_([^\(]*?)\(ndr, (NDR_[^,]*?), (r->((in|out).)?([^,]*?)), (.*?)\);)/ndr_pull_array_$2( ndr, $3, tree, hf_$7_$2_array, $4, $8);/smg;
  
        # Save ndr_pull_relative[12]() calls from being wrapped by the
        # proceeding regexp.