From 008c48568c58665dcd4542f653f69bded0187dea Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 29 Sep 2003 13:16:00 +0000
Subject: small cleanup (thanks to perl_checker) !! default_interfaces() is
 still wrong !!

---
 perl-install/network/shorewall.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 489beb8d6..d6e88eb4e 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -46,8 +46,8 @@ sub get_config_file {
     map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix/etc/shorewall/$file");
 }
 
-sub default_interfaces_silent($) {
-	my ($in) = @_;
+sub default_interfaces_silent {
+	my ($_in) = @_;
 	my %conf;
 	my @l = detect_devices::getNet() or return;
 	if (@l == 1) {
@@ -59,7 +59,7 @@ sub default_interfaces_silent($) {
     \%conf;
 }
 
-sub default_interfaces($) {
+sub default_interfaces {
 	my ($in) = @_;
 	my %conf;
 	my $card_netconnect = network::netconnect::get_net_device() || "eth0";
@@ -88,10 +88,9 @@ Examples:
     \%conf;
 }
 
-sub read($$) {
-    my %conf;
-    my ($in,$mode) = @_;
-    $conf{disabled} = !glob_("$::prefix/etc/rc3.d/S*shorewall");
+sub read {
+    my ($in, $mode) = @_;
+    my %conf = { disabled => !glob_("$::prefix/etc/rc3.d/S*shorewall") };
 
     $conf{ports} = 
       join(' ', map { 
-- 
cgit v1.2.1