holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

De-implement $Shorewall::Config::object_enabled and associated methods

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9772 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-04-01 00:03:51 +00:00
parent d00f52f933
commit d3a54e626c
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -639,8 +639,6 @@ sub compiler {
# #
setup_notrack; setup_notrack;
enable_object;
unless ( $command eq 'check' ) { unless ( $command eq 'check' ) {
# #
# Place Header in the object # Place Header in the object
@ -713,7 +711,6 @@ sub compiler {
emit "}\n"; emit "}\n";
} }
disable_object;
# #
# N E T F I L T E R # N E T F I L T E R
# (Produces no output to the compiled script -- rules are stored in the chain table) # (Produces no output to the compiled script -- rules are stored in the chain table)
@ -784,7 +781,6 @@ sub compiler {
progress_message3 "Shorewall6 configuration verified"; progress_message3 "Shorewall6 configuration verified";
} }
} else { } else {
enable_object;
# #
# I N I T I A L I Z E # I N I T I A L I Z E
# (Writes the initialize() function to the compiled script) # (Writes the initialize() function to the compiled script)

26
Shorewall/Perl/Shorewall/Config.pm
View File

@ -55,8 +55,6 @@ our @EXPORT = qw(
our @EXPORT_OK = qw( $shorewall_dir initialize read_a_line1 set_config_path shorewall); our @EXPORT_OK = qw( $shorewall_dir initialize read_a_line1 set_config_path shorewall);
our %EXPORT_TAGS = ( internal => [ qw( create_temp_object our %EXPORT_TAGS = ( internal => [ qw( create_temp_object
disable_object
enable_object
finalize_object finalize_object
numeric_value numeric_value
numeric_value1 numeric_value1
@ -146,8 +144,6 @@ our $timestamp;
# Object file handle # Object file handle
# #
our $object; our $object;
our $object_enabled;
# #
# True, if last line emitted is blank # True, if last line emitted is blank
# #
@ -300,7 +296,6 @@ sub initialize( $ ) {
$log_verbose = -1; # Verbosity of log. $log_verbose = -1; # Verbosity of log.
$timestamp = ''; # If true, we are to timestamp each progress message $timestamp = ''; # If true, we are to timestamp each progress message
$object = 0; # Object (script) file Handle Reference $object = 0; # Object (script) file Handle Reference
$object_enabled = 0; # Write to object file is disabled.
$lastlineblank = 0; # Avoid extra blank lines in the output $lastlineblank = 0; # Avoid extra blank lines in the output
$indent1 = ''; # Current indentation tabs $indent1 = ''; # Current indentation tabs
$indent2 = ''; # Current indentation spaces $indent2 = ''; # Current indentation spaces
@ -762,8 +757,6 @@ sub in_hex8( $ ) {
# Replaces leading spaces with tabs as appropriate and suppresses consecutive blank lines. # Replaces leading spaces with tabs as appropriate and suppresses consecutive blank lines.
# #
sub emit { sub emit {
assert ( $object_enabled );
if ( $object ) { if ( $object ) {
# #
# 'compile' as opposed to 'check' # 'compile' as opposed to 'check'
@ -788,7 +781,6 @@ sub emit {
# Write passed message to the object with newline but no indentation. # Write passed message to the object with newline but no indentation.
# #
sub emit_unindented( $ ) { sub emit_unindented( $ ) {
assert( $object_enabled );
print $object "$_[0]\n" if $object; print $object "$_[0]\n" if $object;
} }
@ -980,8 +972,6 @@ sub pop_indent() {
# Functions for copying files into the object # Functions for copying files into the object
# #
sub copy( $ ) { sub copy( $ ) {
assert( $object_enabled );
if ( $object ) { if ( $object ) {
my $file = $_[0]; my $file = $_[0];
@ -1012,8 +1002,6 @@ sub copy( $ ) {
# This one handles line continuation and 'here documents' # This one handles line continuation and 'here documents'
sub copy1( $ ) { sub copy1( $ ) {
assert( $object_enabled );
if ( $object ) { if ( $object ) {
my $file = $_[0]; my $file = $_[0];
@ -1091,20 +1079,6 @@ sub create_temp_object( $$ ) {
} }
#
# Enable writing to object
#
sub enable_object() {
$object_enabled = 1;
}
#
# Disable writing to object
#
sub disable_object() {
$object_enabled = 0;
}
# #
# Finalize the object file # Finalize the object file
# #