svn commit: samba r22357 - in branches/SAMBA_4_0: .	source/pidl/lib/Parse/Pidl/Samba3 source/pidl/lib/Parse/Pidl/Samba4	source/pidl/lib/Parse/Pidl/Samba4/NDR	source/pidl/lib/Parse/Pidl/Wireshark source/pidl/tests Author: jelmer
Date: 2007-04-19 01:26:15 +0000 (Thu, 19 Apr 2007)
New Revision: 22357

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22357

Log:
Don't use 'our'

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
   branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm	2007-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm	2007-04-19 01:26:15 UTC (rev 22357)
@@ -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: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2007-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2007-04-19 01:26:15 UTC (rev 22357)
@@ -21,8 +21,8 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
 
 my %constants;
 

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-04-19 01:26:15 UTC (rev 22357)
@@ -9,10 +9,7 @@
 
 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 @@
 	}
 }
 
-our $res;
+my $res;
 my $deferred = [];
 my $tabs = "";
 

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm	2007-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm	2007-04-19 01:26:15 UTC (rev 22357)
@@ -17,8 +17,8 @@
 
 use strict;
 
-our $ret;
-our $ret_hdr;
+my $ret;
+my $ret_hdr;
 my $tabs = "";
 
 sub indent() { $tabs.="\\t"; }

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm	2007-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm	2007-04-19 01:26:15 UTC (rev 22357)
@@ -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: branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl	2007-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl	2007-04-19 01:26:15 UTC (rev 22357)
@@ -234,7 +234,7 @@
 
 is(DumpHfDeclaration(), "
 /* Header field declarations */
-static gint hf_bla = -1;
+static gint hf_bla_idx = -1;
 
 ");
 

