1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-10 04:23:50 +03:00

r22357: Don't use 'our'

This commit is contained in:
Jelmer Vernooij
2007-04-19 01:26:15 +00:00
committed by Gerald (Jerry) Carter
parent 913aa17b02
commit 7989ee2aa0
6 changed files with 13 additions and 16 deletions

View File

@@ -20,8 +20,8 @@ use Parse::Pidl::Samba4 qw(DeclLong);
use vars qw($VERSION); use vars qw($VERSION);
$VERSION = '0.01'; $VERSION = '0.01';
our $res; my $res;
our $res_hdr; my $res_hdr;
my $tabs = ""; my $tabs = "";
sub indent() { $tabs.="\t"; } sub indent() { $tabs.="\t"; }
sub deindent() { $tabs = substr($tabs, 1); } sub deindent() { $tabs = substr($tabs, 1); }

View File

@@ -21,8 +21,8 @@ use Parse::Pidl::Samba4::NDR::Parser qw(GenerateStructEnv GenerateFunctionInEnv
use vars qw($VERSION); use vars qw($VERSION);
$VERSION = '0.01'; $VERSION = '0.01';
our $res; my $res;
our $res_hdr; my $res_hdr;
my %constants; my %constants;

View File

@@ -9,10 +9,7 @@ package Parse::Pidl::Samba4::NDR::Parser;
require Exporter; require Exporter;
@ISA = qw(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 strict;
use Parse::Pidl::Typelist qw(hasType getType mapTypeName); use Parse::Pidl::Typelist qw(hasType getType mapTypeName);
@@ -110,7 +107,7 @@ sub get_value_of($)
} }
} }
our $res; my $res;
my $deferred = []; my $deferred = [];
my $tabs = ""; my $tabs = "";

View File

@@ -17,8 +17,8 @@ $VERSION = '0.01';
use strict; use strict;
our $ret; my $ret;
our $ret_hdr; my $ret_hdr;
my $tabs = ""; my $tabs = "";
sub indent() { $tabs.="\t"; } sub indent() { $tabs.="\t"; }

View File

@@ -32,13 +32,13 @@ use File::Basename;
use vars qw($VERSION); use vars qw($VERSION);
$VERSION = '0.01'; $VERSION = '0.01';
our @ett; my @ett;
our %hf_used = (); my %hf_used = ();
my %return_types = (); my %return_types = ();
my %dissector_used = (); my %dissector_used = ();
our $conformance = undef; my $conformance = undef;
my %ptrtype_mappings = ( my %ptrtype_mappings = (
"unique" => "NDR_POINTER_UNIQUE", "unique" => "NDR_POINTER_UNIQUE",
@@ -70,7 +70,7 @@ sub field2name($)
return $field; return $field;
} }
our %res = (); my %res = ();
my $tabs = ""; my $tabs = "";
my $cur_fn = undef; my $cur_fn = undef;
sub pidl_fn_start($) sub pidl_fn_start($)

View File

@@ -234,7 +234,7 @@ is(DumpHfList(), "\tstatic hf_register_info hf[] = {
is(DumpHfDeclaration(), " is(DumpHfDeclaration(), "
/* Header field declarations */ /* Header field declarations */
static gint hf_bla = -1; static gint hf_bla_idx = -1;
"); ");