summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table/bsd.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-04 12:40:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-04 12:40:19 +0000
commite81614106311688a1932251f23ac42ad04ada4fe (patch)
tree5644b49fb23e5ee78b6283a8b2b8c2194d1711fc /perl-install/partition_table/bsd.pm
parentbe575c0c81a3a2dc6b62abc220bdbc3f5aec09f9 (diff)
downloaddrakx-backup-do-not-use-e81614106311688a1932251f23ac42ad04ada4fe.tar
drakx-backup-do-not-use-e81614106311688a1932251f23ac42ad04ada4fe.tar.gz
drakx-backup-do-not-use-e81614106311688a1932251f23ac42ad04ada4fe.tar.bz2
drakx-backup-do-not-use-e81614106311688a1932251f23ac42ad04ada4fe.tar.xz
drakx-backup-do-not-use-e81614106311688a1932251f23ac42ad04ada4fe.zip
do not use "local *F"
Diffstat (limited to 'perl-install/partition_table/bsd.pm')
-rw-r--r--perl-install/partition_table/bsd.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/partition_table/bsd.pm b/perl-install/partition_table/bsd.pm
index dc85ab3cf..d08cd57aa 100644
--- a/perl-install/partition_table/bsd.pm
+++ b/perl-install/partition_table/bsd.pm
@@ -62,10 +62,10 @@ sub read($$) {
my ($hd, $sector) = @_;
my $tmp;
- local *F; partition_table::raw::openit($hd, *F) or die "failed to open device";
- c::lseek_sector(fileno(F), $sector, $offset) or die "reading of partition in sector $sector failed";
+ my $F = partition_table::raw::openit($hd) or die "failed to open device";
+ c::lseek_sector(fileno($F), $sector, $offset) or die "reading of partition in sector $sector failed";
- sysread F, $tmp, psizeof($main_format) or die "error while reading partition table in sector $sector";
+ sysread $F, $tmp, psizeof($main_format) or die "error while reading partition table in sector $sector";
my %info; @info{@$main_fields} = unpack $main_format, $tmp;
#- TODO verify checksum
@@ -90,13 +90,13 @@ sub write($$$;$) {
my ($hd, $sector, $pt, $info) = @_;
#- handle testing for writing partition table on file only!
- local *F;
+ my $F;
if ($::testing) {
my $file = "/tmp/partition_table_$hd->{device}";
- open F, ">$file" or die "error opening test file $file";
+ open $F, ">$file" or die "error opening test file $file";
} else {
- partition_table::raw::openit($hd, *F, 2) or die "error opening device $hd->{device} for writing";
- c::lseek_sector(fileno(F), $sector, $offset) or return 0;
+ $F = partition_table::raw::openit($hd, 2) or die "error opening device $hd->{device} for writing";
+ c::lseek_sector(fileno($F), $sector, $offset) or return 0;
}
#- TODO compute checksum
@@ -109,7 +109,7 @@ sub write($$$;$) {
pack $format, @$_{@fields};
} @$pt;
- syswrite F, pack($main_format, @$info{@$main_fields}), psizeof($main_format) or return 0;
+ syswrite $F, pack($main_format, @$info{@$main_fields}), psizeof($main_format) or return 0;
1;
}