summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/partition_table')
-rw-r--r--perl-install/partition_table/dos.pm5
-rw-r--r--perl-install/partition_table/lvm_PV.pm2
-rw-r--r--perl-install/partition_table/mac.pm2
-rw-r--r--perl-install/partition_table/raw.pm4
4 files changed, 7 insertions, 6 deletions
diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm
index e448ad841..cb687e6b0 100644
--- a/perl-install/partition_table/dos.pm
+++ b/perl-install/partition_table/dos.pm
@@ -35,7 +35,8 @@ sub compute_CHS($$) {
}
sub CHS2rawCHS {
- my ($hd, $c, $h, $s) = @_;
+ my ($hd, $chs) = @_;
+ my ($c, $h, $s) = @$chs;
if ($c > 1023) {
#- no way to have a #cylinder >= 1024
$c = 1023;
@@ -51,7 +52,7 @@ sub sector2CHS {
my ($s, $h);
($start, $s) = divide($start, $hd->{geom}{sectors});
($start, $h) = divide($start, $hd->{geom}{heads});
- ($start, $h, $s + 1);
+ [ $start, $h, $s + 1 ];
}
sub read {
diff --git a/perl-install/partition_table/lvm_PV.pm b/perl-install/partition_table/lvm_PV.pm
index c2ff30fb6..6311a7da5 100644
--- a/perl-install/partition_table/lvm_PV.pm
+++ b/perl-install/partition_table/lvm_PV.pm
@@ -1,4 +1,4 @@
-package partition_table::lvm; # $Id$
+package partition_table::lvm_PV; # $Id$
use diagnostics;
use strict;
diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm
index 942136bf1..004baffbe 100644
--- a/perl-install/partition_table/mac.pm
+++ b/perl-install/partition_table/mac.pm
@@ -103,7 +103,7 @@ sub read($$) {
my $F = partition_table::raw::openit($hd) or die "failed to open device";
c::lseek_sector(fileno($F), $sector, 0) or die "reading of partition in sector $sector failed";
- sysread $F, $tmp, psizeof($bz_format) or die "error while reading bz \(Block Zero\) in sector $sector";
+ sysread $F, $tmp, psizeof($bz_format) or die "error while reading bz (Block Zero) in sector $sector";
my %info; @info{@$bz_fields} = unpack $bz_format, $tmp;
foreach (1 .. $info{bzDrvrCnt}) {
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index 9d7fb5688..39a1ff026 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -109,8 +109,8 @@ sub get_geometry($) {
}
sub openit {
- my ($hd, $mode) = @_;
- my $F; sysopen($F, $hd->{file}, $mode || 0) and $F;
+ my ($hd, $o_mode) = @_;
+ my $F; sysopen($F, $hd->{file}, $o_mode || 0) and $F;
}
# cause kernel to re-read partition table