From: Douglas Bagnall Date: Sun, 1 Dec 2019 09:41:06 +0000 (+1300) Subject: pidl: don't export parser class methods X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=eddd6c52678b28131d5dba67e6a8eaf4e5696a92 pidl: don't export parser class methods These methods are not used or usable as exported functions. The correct (and actual) usage is along these lines; require Parse::Pidl::Samba3::ClientNDR; my $generator = new Parse::Pidl::Samba3::ClientNDR(); my ($c_code,$h_code) = $generator->Parse($ndr, $header, $c_header); where the methods are either explicitly referenced (new A::B::C), or are called from the blessed object, neither of which need exporting. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Dec 4 06:35:06 UTC 2019 on sn-devel-184 --- diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm index 4d125cc799d..c132b552f9a 100644 --- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm +++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm @@ -8,10 +8,6 @@ package Parse::Pidl::Samba3::ClientNDR; use base Parse::Pidl::Base; -use Exporter; -push @ISA, qw(Exporter); -@EXPORT_OK = qw(ParseFunction $res $res_hdr); - use strict; use Parse::Pidl qw(fatal warning error); use Parse::Pidl::Util qw(has_property ParseExpr genpad); diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm index 381bc46defa..ddd757c749b 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm @@ -7,10 +7,6 @@ package Parse::Pidl::Samba4::NDR::Client; use parent Parse::Pidl::Base; -use Exporter; -push @ISA, qw(Exporter); -@EXPORT_OK = qw(Parse); - use Parse::Pidl qw(fatal warning error); use Parse::Pidl::Util qw(has_property ParseExpr genpad); use Parse::Pidl::NDR qw(ContainsPipe); diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm index 75d6ccb356e..a50f0b54df6 100644 --- a/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -6,9 +6,6 @@ package Parse::Pidl::Samba4::Python; use parent Parse::Pidl::Base; -use Exporter; -push @ISA, 'Exporter'; - use strict; use Parse::Pidl qw(warning fatal error); use Parse::Pidl::Typelist qw(hasType resolveType getType mapTypeName expandAlias bitmap_type_fn enum_type_fn); diff --git a/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm index aaabe3328e9..9cb483c0ae0 100644 --- a/pidl/lib/Parse/Pidl/Samba4/TDR.pm +++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm @@ -11,10 +11,6 @@ use Parse::Pidl::Typelist qw(mapTypeName); use base Parse::Pidl::Base; -use Exporter; -push @ISA, qw(Exporter); -@EXPORT_OK = qw(ParserType $res $res_hdr); - use vars qw($VERSION); $VERSION = '0.01'; diff --git a/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl index c758ef45425..4349abb39d6 100755 --- a/pidl/tests/samba3-cli.pl +++ b/pidl/tests/samba3-cli.pl @@ -9,7 +9,7 @@ use FindBin qw($RealBin); use lib "$RealBin"; use Util; use Parse::Pidl::Util qw(MyDumper); -use Parse::Pidl::Samba3::ClientNDR qw(ParseFunction); +use Parse::Pidl::Samba3::ClientNDR; use Parse::Pidl::Samba4::Header qw(GenerateFunctionInEnv GenerateFunctionOutEnv); # Make sure GenerateFunctionInEnv and GenerateFunctionOutEnv work