Author: aschnell Date: Sat Jul 26 15:30:05 2008 New Revision: 49431 URL: http://svn.opensuse.org/viewcvs/yast?rev=49431&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=49431&r1=49430&r2=49431&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Sat Jul 26 15:30:05 2008 @@ -1127,21 +1127,15 @@ } -static bool isExtended( const Partition& p ) - { - return( Volume::notDeleted(p) && p.type()==EXTENDED ); - } - - unsigned int Disk::numPrimary() const { return partPair(notDeletedPri).length(); } bool Disk::hasExtended() const - { - return( ext_possible && !partPair(isExtended).empty() ); - } +{ + return ext_possible && !partPair(notDeletedExt).empty(); +} unsigned int Disk::numLogical() const { @@ -1244,7 +1238,7 @@ } if( all || logical ) { - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); if( !ext.empty() ) { PartPair p = partPair( notDeletedLog ); @@ -1284,7 +1278,7 @@ --i; if( i->len()>=cylLen ) { - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); PartitionType t = PRIMARY; bool usable = false; do @@ -1324,7 +1318,7 @@ { free.sort( regions_sort_size ); list<Region>::iterator i = free.begin(); - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); PartitionType t = type; bool usable = false; do @@ -1421,7 +1415,7 @@ unsigned fuzz = checkRelaxed ? 2 : 0; int ret = 0; Region r( start, len ); - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); if( type==PTYPE_ANY ) { if( ext.empty() || !ext.begin()->contains( Region(start,1) )) @@ -1514,7 +1508,7 @@ } if( ret==0 && part->type()==LOGICAL ) { - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); p = partPair( notDeletedLog ); PartIter i = p.begin(); while( i!=p.end() && (i==part||!i->intersectArea( r, fuzz )) ) @@ -2215,7 +2209,7 @@ unsigned long maxc = cylinders(); if( p->type()==LOGICAL ) { - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); if( !ext.empty() ) maxc = ext.begin()->cylEnd(); } @@ -2401,7 +2395,7 @@ if( ret==0 && newCyl>p->cylSize() ) { unsigned long increase = newCyl - p->cylSize(); - PartPair pp = partPair( isExtended ); + PartPair pp = partPair(notDeletedExt); unsigned long start = p->cylEnd()+1; unsigned long end = cylinders(); if( p->type()==LOGICAL && !pp.empty() ) @@ -2517,7 +2511,7 @@ } else if( p->type()==LOGICAL ) { - PartPair ext = partPair(isExtended); + PartPair ext = partPair(notDeletedExt); if( !ext.empty() ) { unsigned long long start_ext, end_ext; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org