summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-04-19 01:26:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:06 -0500
commita0bfcfa55d9f00ffab59e8cf7529cadf108a5629 (patch)
treec6c78738c941860e2ef66db43c85605ae3a44485 /source4
parentefe1883d9b278d97715cdc62cc50a105b2e455b2 (diff)
downloadsamba-a0bfcfa55d9f00ffab59e8cf7529cadf108a5629.tar.gz
samba-a0bfcfa55d9f00ffab59e8cf7529cadf108a5629.tar.bz2
samba-a0bfcfa55d9f00ffab59e8cf7529cadf108a5629.zip
r22357: Don't use 'our'
(This used to be commit 7989ee2aa015264dc9334b5e15d4fe6cb55f4e09)
Diffstat (limited to 'source4')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm4
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm4
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm7
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm4
-rw-r--r--source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm8
-rwxr-xr-xsource4/pidl/tests/wireshark-ndr.pl2
6 files changed, 13 insertions, 16 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 8fa37ca300..a2219bdab2 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -20,8 +20,8 @@ use Parse::Pidl::Samba4 qw(DeclLong);
use vars qw($VERSION);
$VERSION = '0.01';
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
my $tabs = "";
sub indent() { $tabs.="\t"; }
sub deindent() { $tabs = substr($tabs, 1); }
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index 054074297b..ea8a96872c 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -21,8 +21,8 @@ use Parse::Pidl::Samba4::NDR::Parser qw(GenerateStructEnv GenerateFunctionInEnv
use vars qw($VERSION);
$VERSION = '0.01';
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
my %constants;
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index eaf66ea0c3..719d885c2d 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -9,10 +9,7 @@ package Parse::Pidl::Samba4::NDR::Parser;
require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(is_charset_array);
-@EXPORT_OK = qw(check_null_pointer GenerateFunctionInEnv
- GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction
- NeededElement NeededType $res NeededInterface TypeFunctionName ParseElementPrint);
+@EXPORT_OK = qw(check_null_pointer GenerateFunctionInEnv GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction NeededElement NeededType $res NeededInterface TypeFunctionName ParseElementPrint);
use strict;
use Parse::Pidl::Typelist qw(hasType getType mapTypeName);
@@ -110,7 +107,7 @@ sub get_value_of($)
}
}
-our $res;
+my $res;
my $deferred = [];
my $tabs = "";
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
index f1f23bf84b..dc1c715353 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
@@ -17,8 +17,8 @@ $VERSION = '0.01';
use strict;
-our $ret;
-our $ret_hdr;
+my $ret;
+my $ret_hdr;
my $tabs = "";
sub indent() { $tabs.="\t"; }
diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 51e3933013..aafaa3cc2b 100644
--- a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -32,13 +32,13 @@ use File::Basename;
use vars qw($VERSION);
$VERSION = '0.01';
-our @ett;
+my @ett;
-our %hf_used = ();
+my %hf_used = ();
my %return_types = ();
my %dissector_used = ();
-our $conformance = undef;
+my $conformance = undef;
my %ptrtype_mappings = (
"unique" => "NDR_POINTER_UNIQUE",
@@ -70,7 +70,7 @@ sub field2name($)
return $field;
}
-our %res = ();
+my %res = ();
my $tabs = "";
my $cur_fn = undef;
sub pidl_fn_start($)
diff --git a/source4/pidl/tests/wireshark-ndr.pl b/source4/pidl/tests/wireshark-ndr.pl
index 40e22d958c..724b79ee10 100755
--- a/source4/pidl/tests/wireshark-ndr.pl
+++ b/source4/pidl/tests/wireshark-ndr.pl
@@ -234,7 +234,7 @@ is(DumpHfList(), "\tstatic hf_register_info hf[] = {
is(DumpHfDeclaration(), "
/* Header field declarations */
-static gint hf_bla = -1;
+static gint hf_bla_idx = -1;
");