diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-14 01:30:44 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-14 19:53:06 +0100 |
| commit | 5d60cb6ef1c63ce771ab44b6831147568061aa50 (patch) | |
| tree | cff090a954f9aa820c65ea9b11096f4b51e821b8 /source4/pidl/lib/Parse/Pidl/Samba4/NDR | |
| parent | d8b21ae2534d5b51c1dc5a4c50b3de5ddb32af80 (diff) | |
| download | samba-5d60cb6ef1c63ce771ab44b6831147568061aa50.tar.gz samba-5d60cb6ef1c63ce771ab44b6831147568061aa50.tar.bz2 samba-5d60cb6ef1c63ce771ab44b6831147568061aa50.zip | |
pidl/python: Fix parsing arguments, fix more pointer issues.
(This used to be commit b00c1a072457e5083ffc24a8b74b3793d0b44eee)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/Samba4/NDR')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 0800a19fab..02d3a80992 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -15,7 +15,7 @@ use strict; use Parse::Pidl::Typelist qw(hasType getType mapTypeName typeHasBody); use Parse::Pidl::Util qw(has_property ParseExpr ParseExprExt print_uuid); use Parse::Pidl::CUtil qw(get_pointer_to get_value_of); -use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred); +use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred is_charset_array); use Parse::Pidl::Samba4 qw(is_intree choose_header); use Parse::Pidl::Samba4::Header qw(GenerateFunctionInEnv GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv); use Parse::Pidl qw(warning); @@ -78,19 +78,6 @@ sub has_fast_array($$) return ($t->{NAME} eq "uint8") or ($t->{NAME} eq "string"); } -sub is_charset_array($$) -{ - my ($e,$l) = @_; - - return 0 if ($l->{TYPE} ne "ARRAY"); - - my $nl = GetNextLevel($e,$l); - - return 0 unless ($nl->{TYPE} eq "DATA"); - - return has_property($e, "charset"); -} - #################################### # pidl() is our basic output routine |