Rev 11921: Don't use 'our' in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11921
revision-id: jelmer at samba.org-20070419015445-jk2l014botybpwdt
parent: jelmer at samba.org-20070419005219-xhzck81g2odsayyq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Thu 2007-04-19 03:54:45 +0200
message:
  Don't use 'our'
modified:
  source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm svn-v2:15437 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba3%2fClientNDR.pm
  source/pidl/lib/Parse/Pidl/Samba4/EJS.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fEJS.pm
  source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fNDR%2fParser.pm
  source/pidl/lib/Parse/Pidl/Samba4/TDR.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fTDR.pm
  source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm svn-v2:16824 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fWireshark%2fNDR.pm
  source/pidl/tests/wireshark-ndr.pl svn-v2:21411 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2ftests%2fwireshark%2dndr.pl
=== modified file 'source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm	2007-02-18 18:44:56 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm	2007-04-19 01:54:45 +0000
@@ -20,8 +20,8 @@
 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); }

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/EJS.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2007-02-28 13:25:53 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2007-04-19 01:54:45 +0000
@@ -21,8 +21,8 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
 
 my %constants;
 

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-03-02 14:53:09 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-04-19 01:54:45 +0000
@@ -9,10 +9,7 @@
 
 require Exporter;
 @ISA = qw(Exporter);
- at EXPORT = qw(is_charset_array);
- at EXPORT_OK = qw(check_null_pointer GenerateFunctionInEnv 
-   GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction
-   NeededElement NeededType $res NeededInterface TypeFunctionName ParseElementPrint);
+ at 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 @@
 	}
 }
 
-our $res;
+my $res;
 my $deferred = [];
 my $tabs = "";
 

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/TDR.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm	2007-02-18 18:44:56 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm	2007-04-19 01:54:45 +0000
@@ -17,8 +17,8 @@
 
 use strict;
 
-our $ret;
-our $ret_hdr;
+my $ret;
+my $ret_hdr;
 my $tabs = "";
 
 sub indent() { $tabs.="\t"; }

=== modified file 'source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm'
--- a/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm	2007-03-28 22:52:37 +0000
+++ b/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm	2007-04-19 01:54:45 +0000
@@ -32,13 +32,13 @@
 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 @@
     return $field;
 }
 
-our %res = ();
+my %res = ();
 my $tabs = "";
 my $cur_fn = undef;
 sub pidl_fn_start($)

=== modified file 'source/pidl/tests/wireshark-ndr.pl'
--- a/source/pidl/tests/wireshark-ndr.pl	2007-02-27 21:37:31 +0000
+++ b/source/pidl/tests/wireshark-ndr.pl	2007-04-19 01:54:45 +0000
@@ -234,7 +234,7 @@
 
 is(DumpHfDeclaration(), "
 /* Header field declarations */
-static gint hf_bla = -1;
+static gint hf_bla_idx = -1;
 
 ");