diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-18 10:32:56 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-18 10:32:56 +0000 |
commit | e31295b058b23831d5ceced25adc058df97704d3 (patch) | |
tree | b21d322d1534d5239ba386ee678a0c23470bea57 | |
parent | ce9f2f3dc52173a581d8a6c2ab41e2911d4a47e6 (diff) | |
download | drakx-e31295b058b23831d5ceced25adc058df97704d3.tar drakx-e31295b058b23831d5ceced25adc058df97704d3.tar.gz drakx-e31295b058b23831d5ceced25adc058df97704d3.tar.bz2 drakx-e31295b058b23831d5ceced25adc058df97704d3.tar.xz drakx-e31295b058b23831d5ceced25adc058df97704d3.zip |
rename ->read to ->read_one
-rw-r--r-- | perl-install/partition_table.pm | 4 | ||||
-rw-r--r-- | perl-install/partition_table/bsd.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/dos.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/empty.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/gpt.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/mac.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/sun.pm | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 632085b26..7f309d329 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -245,14 +245,14 @@ sub read_one($$) { # perl_checker: require partition_table::sun require "partition_table/$_.pm"; bless $hd, "partition_table::$_"; - ($pt, $info) = $hd->read($sector); + ($pt, $info) = $hd->read_one($sector); log::l("found a $_ partition table on $hd->{file} at sector $sector"); }; $@ or last; } } else { #- keep current blessed object for that, this means it is neccessary to read sector 0 before. - ($pt, $info) = $hd->read($sector); + ($pt, $info) = $hd->read_one($sector); } my @extended = $hd->hasExtended ? grep { isExtended($_) } @$pt : (); diff --git a/perl-install/partition_table/bsd.pm b/perl-install/partition_table/bsd.pm index d01f0ad7e..9421eae17 100644 --- a/perl-install/partition_table/bsd.pm +++ b/perl-install/partition_table/bsd.pm @@ -61,7 +61,7 @@ my $offset = 0x40; sub use_pt_type { 1 } -sub read($$) { +sub read_one { my ($hd, $sector) = @_; my $tmp; diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm index 688626d7b..c12b7cba4 100644 --- a/perl-install/partition_table/dos.pm +++ b/perl-install/partition_table/dos.pm @@ -197,7 +197,7 @@ sub set_best_geometry_for_the_partition_table { } } -sub read { +sub read_one { my ($hd, $sector) = @_; my $tmp; diff --git a/perl-install/partition_table/empty.pm b/perl-install/partition_table/empty.pm index b34b9210c..e5d3c5685 100644 --- a/perl-install/partition_table/empty.pm +++ b/perl-install/partition_table/empty.pm @@ -17,7 +17,7 @@ use partition_table; use c; -sub read($$) { +sub read_one { my ($hd, $sector) = @_; my $tmp; diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm index ba9307df3..81967d07e 100644 --- a/perl-install/partition_table/gpt.pm +++ b/perl-install/partition_table/gpt.pm @@ -138,7 +138,7 @@ sub read_partitionEntries { \@pt; } -sub read { +sub read_one { my ($hd, $sector) = @_; my $l = partition_table::dos::read($hd, $sector); diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm index 779799188..2922bc7a3 100644 --- a/perl-install/partition_table/mac.pm +++ b/perl-install/partition_table/mac.pm @@ -98,7 +98,7 @@ sub adjustEnd($$) { my ($_hd, $_part) = @_; } -sub read($$) { +sub read_one { my ($hd, $sector) = @_; my $tmp; diff --git a/perl-install/partition_table/sun.pm b/perl-install/partition_table/sun.pm index d5d29e27b..1532c04a9 100644 --- a/perl-install/partition_table/sun.pm +++ b/perl-install/partition_table/sun.pm @@ -73,7 +73,7 @@ sub compute_crc($) { $crc; } -sub read($$) { +sub read_one { my ($hd, $sector) = @_; my $tmp; |