diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-09 13:53:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:36 -0500 |
| commit | 01d23b0e5454f317c1529fed829d24a32fdcc44d (patch) | |
| tree | d622f5a2b047bc958a61f486ff8541dae6557443 /source4/pidl/lib | |
| parent | a1f60c9b0d3a86c356f4e642b9bcb32a8e03b28f (diff) | |
| download | samba-01d23b0e5454f317c1529fed829d24a32fdcc44d.tar.gz samba-01d23b0e5454f317c1529fed829d24a32fdcc44d.tar.bz2 samba-01d23b0e5454f317c1529fed829d24a32fdcc44d.zip | |
r10849: Fix handling of [charset] for strings with fixed or "inline" size
(This used to be commit 3c2558d11ec1d0b41e5b36b793d9e64db2e203b6)
Diffstat (limited to 'source4/pidl/lib')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm index 3f08cbb527..da60a02059 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm @@ -575,8 +575,7 @@ sub ParseElementPushLevel my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred); - if ($l->{TYPE} eq "ARRAY" and ($l->{IS_CONFORMANT} or $l->{IS_VARYING} - or is_charset_array($e, $l))) { + if ($l->{TYPE} eq "ARRAY" and ($l->{IS_CONFORMANT} or $l->{IS_VARYING})) { $var_name = get_pointer_to($var_name); } @@ -721,8 +720,7 @@ sub ParseElementPrint($$$) } elsif ($l->{TYPE} eq "ARRAY") { my $length; - if ($l->{IS_CONFORMANT} or $l->{IS_VARYING} or - is_charset_array($e,$l)) { + if ($l->{IS_CONFORMANT} or $l->{IS_VARYING}) { $var_name = get_pointer_to($var_name); } @@ -927,8 +925,7 @@ sub ParseElementPullLevel my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred); - if ($l->{TYPE} eq "ARRAY" and ($l->{IS_VARYING} or $l->{IS_CONFORMANT} - or is_charset_array($e,$l))) { + if ($l->{TYPE} eq "ARRAY" and ($l->{IS_VARYING} or $l->{IS_CONFORMANT})) { $var_name = get_pointer_to($var_name); } |