summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-08 09:01:56 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-08 09:01:56 +0000
commit467247dfe6464f1578c07bdfc2cca4b3fb94ecc7 (patch)
tree94b651256b7afee587f1859ef0bbe8d523550080
parent9d52e25556cdfbcd34c10cc665a994070bc94e43 (diff)
downloaddrakx-467247dfe6464f1578c07bdfc2cca4b3fb94ecc7.tar
drakx-467247dfe6464f1578c07bdfc2cca4b3fb94ecc7.tar.gz
drakx-467247dfe6464f1578c07bdfc2cca4b3fb94ecc7.tar.bz2
drakx-467247dfe6464f1578c07bdfc2cca4b3fb94ecc7.tar.xz
drakx-467247dfe6464f1578c07bdfc2cca4b3fb94ecc7.zip
isdn_read_config() alter its argument, thus there's no need in returning it
(which may induce developer in error by believing argument is not overwritten...) standalone drakconnect already discard returned value anyway...
-rw-r--r--perl-install/network/isdn.pm1
-rw-r--r--perl-install/network/netconnect.pm4
2 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index d73339f08..23c5e24e1 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -103,7 +103,6 @@ sub isdn_read_config {
#$isdn->{description} = '';
#$isdn->{vendor} = '';
#$isdn->{passwd2} = '';
- $isdn;
}
my $file = "$ENV{SHARE_PATH}/ldetect-lst/isdn.db";
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 221a1352c..063111220 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -318,7 +318,7 @@ sub real_main {
detect($netc->{autodetect}, 'modem');
$netc->{isdntype} = 'isdn_external';
$netcnx->{isdn_external}{device} = network::modem::first_modem($netc);
- $netcnx->{isdn_external} = isdn_read_config($netcnx->{isdn_external});
+ isdn_read_config($netcnx->{isdn_external});
$netcnx->{isdn_external}{special_command} = 'AT&F&O2B40';
require network::modem;
$modem = $netcnx->{isdn_external};
@@ -334,7 +334,7 @@ sub real_main {
$isdn->{description} =~ s/\|/ -- /;
}
- $netcnx->{isdn_internal} = isdn_read_config($netcnx->{isdn_internal});
+ isdn_read_config($netcnx->{isdn_internal});
return "isdn_protocol";
},
},