andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

make API cleaner: don't use out param if a return value will do 

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1128321
This commit is contained in:
Volker Lanz 2010-05-18 22:48:56 +00:00
parent d058abce6e
commit faa406a201
7 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -12,9 +12,6 @@ Bugs to fix for 1.1:
* why does CoreBackendPartitionTable::detectFileSystemBySector() take a Device
and not a CoreBackendDevice?
* why can't CoreBackendPartitionTable::createPartition() return an int and use 0
or -1 as error code and otherwise return the new number?
===============================================================================
For releases after 1.1:

6
src/backend/corebackendpartitiontable.h
View File

@ -104,11 +104,9 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT CoreBackendPartitionTable
* Create a new partition.
* @param report the report to write information to
* @param partition the new partition to create on disk
* @param new_number output value holding the new number the OS sees the partition under
* (e.g. 7 for "/dev/sda7")
* @return true on success
* @return the new number the OS sees the partition under (e.g. 7 for "/dev/sda7") or -1 on failure
*/
virtual bool createPartition(Report& report, const Partition& partition, quint32& new_number) = 0;
virtual qint32 createPartition(Report& report, const Partition& partition) = 0;
/**
* Update the geometry for a partition in the partition table.

6
src/jobs/createpartitionjob.cpp
View File

@ -58,11 +58,11 @@ bool CreatePartitionJob::run(Report& parent)
if (backendPartitionTable)
{
quint32 num = -1;
rval = backendPartitionTable->createPartition(*report, partition(), num);
qint32 num = backendPartitionTable->createPartition(*report, partition());
if (rval)
if (num > 0)
{
rval = true;
partition().setNumber(num);
partition().setState(Partition::StateNone);
backendPartitionTable->commit();

3
src/plugins/dummy/dummypartitiontable.cpp
View File

@ -67,11 +67,10 @@ CoreBackendPartition* DummyPartitionTable::getPartitionBySector(qint64 sector)
return new DummyPartition();
}
bool DummyPartitionTable::createPartition(Report& report, const Partition& partition, quint32& new_number)
qint32 DummyPartitionTable::createPartition(Report& report, const Partition& partition)
{
Q_UNUSED(report);
Q_UNUSED(partition);
Q_UNUSED(new_number);
return true;
}

2
src/plugins/dummy/dummypartitiontable.h
View File

@ -45,7 +45,7 @@ class DummyPartitionTable : public CoreBackendPartitionTable
virtual CoreBackendPartition* getExtendedPartition();
virtual CoreBackendPartition* getPartitionBySector(qint64 sector);
virtual bool createPartition(Report& report, const Partition& partition, quint32& new_number);
virtual qint32 createPartition(Report& report, const Partition& partition);
virtual bool deletePartition(Report& report, const Partition& partition);
virtual bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end);
virtual bool clobberFileSystem(Report& report, const Partition& partition);

11
src/plugins/libparted/libpartedpartitiontable.cpp
View File

@ -144,11 +144,11 @@ static PedFileSystemType* getPedFileSystemType(FileSystem::Type t)
return ped_file_system_type_get("ext2");
}
bool LibPartedPartitionTable::createPartition(Report& report, const Partition& partition, quint32& new_number)
qint32 LibPartedPartitionTable::createPartition(Report& report, const Partition& partition)
{
Q_ASSERT(partition.devicePath() == pedDevice()->path);
bool rval = false;
qint32 rval = -1;
// According to libParted docs, PedPartitionType can be "NULL if unknown". That's obviously wrong,
// it's a typedef for an enum. So let's use something the libparted devs will hopefully never
@ -187,14 +187,11 @@ bool LibPartedPartitionTable::createPartition(Report& report, const Partition& p
if (pedConstraint == NULL)
{
report.line() << i18nc("@info/plain", "Failed to create a new partition: could not get geometry for constraint.");
return false;
return -1;
}
if (ped_disk_add_partition(pedDisk(), pedPartition, pedConstraint))
{
new_number = pedPartition->num;
rval = true;
}
rval = pedPartition->num;
else
report.line() << i18nc("@info/plain", "Failed to add partition <filename>%1</filename> to device <filename>%2</filename>.", partition.deviceNode(), pedDisk()->dev->path);

2
src/plugins/libparted/libpartedpartitiontable.h
View File

@ -48,7 +48,7 @@ class LibPartedPartitionTable : public CoreBackendPartitionTable
virtual CoreBackendPartition* getExtendedPartition();
virtual CoreBackendPartition* getPartitionBySector(qint64 sector);
virtual bool createPartition(Report& report, const Partition& partition, quint32& new_number);
virtual qint32 createPartition(Report& report, const Partition& partition);
virtual bool deletePartition(Report& report, const Partition& partition);
virtual bool updateGeometry(Report& report, const Partition& partition, qint64 sector_start, qint64 sector_end);
virtual bool clobberFileSystem(Report& report, const Partition& partition);