From 73c851144720e28b21a491b6250385170db9d752 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 24 Apr 2003 19:00:12 +0000 Subject: perl_checker adaptations + fixes --- perl-install/network/isdn.pm | 4 ++-- perl-install/network/netconnect.pm | 4 ++-- perl-install/network/shorewall.pm | 4 ++-- perl-install/network/tools.pm | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'perl-install/network') diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 8834d7ba6..0028ecce7 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -235,7 +235,7 @@ sub isdn_ask_info { ask_info2($isdn, $netc); } -sub isdn_ask_protocol { +sub isdn_ask_protocol() { my @toto = ( { description => $::expert ? N("European protocol (EDSS1)") : N("European protocol"), protokol => 2 }, @@ -327,7 +327,7 @@ sub isdn_detect_backend { } } -sub isdn_get_list { +sub isdn_get_list() { map { $_->{description} } @isdn::isdndata; } diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8ef994583..3ba28075f 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -414,7 +414,7 @@ sub add_profile { cp_af($cmd1, $cmd2); } -sub get_profiles { +sub get_profiles() { map { if_(/drakconnect_conf\.(.*)/, $1) } all("$::prefix/etc/sysconfig/network-scripts"); } @@ -463,7 +463,7 @@ my $file = "$dir/draknet$suffix"; getVarsFromSh("$dir/drakconnect_conf"); } -sub get_net_device { +sub get_net_device() { #${{ read_raw_net_conf() }}{InternetInterface}; my $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up"; my $network_file = "/etc/sysconfig/network"; diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm index 083c90ae3..b41bb636a 100644 --- a/perl-install/network/shorewall.pm +++ b/perl-install/network/shorewall.pm @@ -46,7 +46,7 @@ sub get_config_file { map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix/etc/shorewall/$file"); } -sub default_interfaces { +sub default_interfaces() { my %conf; my @l = detect_devices::getNet() or return; @@ -59,7 +59,7 @@ sub default_interfaces { \%conf; } -sub read { +sub read() { my %conf; $conf{disabled} = !glob_("$::prefix/etc/rc3.d/S*shorewall"); diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index c7175a0d3..19921b5d0 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -39,7 +39,7 @@ sub unquotify { $$word =~ s/^(['"]?)(.*)\1$/$2/; } -sub read_secret_backend { +sub read_secret_backend() { my $conf; foreach my $i ("pap-secrets", "chap-secrets") { foreach (cat_("$prefix/etc/ppp/$i")) { @@ -102,9 +102,9 @@ Try to reconfigure your connection."); $up; } -sub connect_backend { run_program::rooted($prefix, "$connect_prog &") } +sub connect_backend() { run_program::rooted($prefix, "$connect_prog &") } -sub disconnect_backend { run_program::rooted($prefix, "$disconnect_file &") } +sub disconnect_backend() { run_program::rooted($prefix, "$disconnect_file &") } sub read_providers_backend { my ($file) = @_; map { /(.*?)=>/ } catMaybeCompressed($file) } @@ -141,7 +141,7 @@ sub ask_info2 { 1; } -sub detect_timezone { +sub detect_timezone() { my %tmz2country = ( 'Europe/Paris' => N("France"), 'Europe/Amsterdam' => N("Netherlands"), @@ -170,7 +170,7 @@ sub type2interface { [ lan => 'eth' ]; } -sub connected { gethostbyname("mandrakesoft.com") ? 1 : 0 } +sub connected() { gethostbyname("mandrakesoft.com") ? 1 : 0 } my $kid_pipe; sub connected_bg { @@ -235,7 +235,7 @@ sub test_connected { return $current_connection_status; } -sub connected2 { +sub connected2() { if ($kid_pid = open(my $kid_to_read, "-|")) { #- parent $kid_to_read; @@ -247,10 +247,10 @@ sub connected2 { } } -sub disconnected {} +sub disconnected() {} -sub write_initscript { +sub write_initscript() { $::testing and return; output_with_perm("$prefix/etc/rc.d/init.d/internet", 0755, sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file)); -- cgit v1.2.1