diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-09 13:53:48 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-10-09 13:53:48 +0000 |
| commit | 907f4a4c0060cb447f2aefd734e8431e0bd3f964 (patch) | |
| tree | f89e4e02f6d733fd92508e0398349acaecdbc121 | |
| parent | 78210f3a1787772254057819ac7c559d58517807 (diff) | |
| download | samba-907f4a4c0060cb447f2aefd734e8431e0bd3f964.tar.gz samba-907f4a4c0060cb447f2aefd734e8431e0bd3f964.tar.xz samba-907f4a4c0060cb447f2aefd734e8431e0bd3f964.zip | |
r10849: Fix handling of [charset] for strings with fixed or "inline" size
| -rw-r--r-- | source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm b/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm index 3f08cbb5273..da60a02059a 100644 --- a/source/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm +++ b/source/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); } |