From 381d59995b7f0bebbf7bcde1fce1699615fe5ab8 Mon Sep 17 00:00:00 2001 From: teastep Date: Sun, 25 Mar 2007 16:59:46 +0000 Subject: [PATCH] Remove anachronistic functions from prog.functions git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5683 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- New/Shorewall/Common.pm | 8 ++++++++ New/prog.functions | 16 ---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/New/Shorewall/Common.pm b/New/Shorewall/Common.pm index f3df667e9..0ac69b3da 100644 --- a/New/Shorewall/Common.pm +++ b/New/Shorewall/Common.pm @@ -98,6 +98,14 @@ sub fatal_error die; } +# +# Pre-process a line from a configuration file. +# +# chomp it. +# compress out redundent white space. +# ensure that it has an appropriate number of columns. +# supply '-' in omitted trailing columns. +# sub split_line( $$ ) { my ( $columns, $description ) = @_; diff --git a/New/prog.functions b/New/prog.functions index 2271fa2ef..894af6331 100644 --- a/New/prog.functions +++ b/New/prog.functions @@ -125,22 +125,6 @@ run_tc() { fi } -# -# Functions to appease unconverted extension scripts -# -save_command() -{ - return 0 -} - -run_and_save_command() { - eval $@ -} - -ensure_and_save_command() { - eval $@ || fatal_error "Command \"$@\" failed" -} - restore_dynamic_rules() { if [ -f ${VARDIR}/save ]; then progress_message2 "Setting up dynamic rules..."