Use a foreach instead of a while in insertUnallocated().

Also, no need to check if the free space is large enough: createUnallocated()
will return NULL if it isn't and PartitionNode::insert() can deal with that.

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=908086
This commit is contained in:
Volker Lanz 2009-01-09 09:25:59 +00:00
parent 5c7cc1eceb
commit 3c910d61cd
1 changed files with 2 additions and 7 deletions

View File

@ -504,20 +504,15 @@ void PartitionTable::insertUnallocated(const Device& d, PartitionNode* p, qint64
Q_ASSERT(p != NULL);
qint64 lastEnd = start;
qint32 i = 0;
while (i < p->children().size())
foreach (Partition* child, p->children())
{
Partition* child = p->children()[i];
if (child->firstSector() - lastEnd >= d.cylinderSize())
p->insert(createUnallocated(d, *p, lastEnd, child->firstSector() - 1));
p->insert(createUnallocated(d, *p, lastEnd, child->firstSector() - 1));
if (child->roles().has(PartitionRole::Extended))
insertUnallocated(d, child, child->firstSector());
lastEnd = child->lastSector() + 1;
i++;
}
// Take care of the free space between the end of the last child and the end