Added getSingleMasterIndex() for command-line tool.

This commit is contained in:
Florian Pose
2010-03-11 15:17:25 +01:00
parent ddaee8a1fc
commit aa0b667b4f
15 changed files with 27 additions and 96 deletions
+1 -8
View File
@@ -82,7 +82,6 @@ string CommandFoeWrite::helpString() const
void CommandFoeWrite::execute(const StringVector &args)
{
MasterIndexList masterIndices;
stringstream err;
ec_ioctl_slave_foe_t data;
ifstream file;
@@ -94,13 +93,6 @@ void CommandFoeWrite::execute(const StringVector &args)
throwInvalidUsageException(err);
}
masterIndices = getMasterIndices();
if (masterIndices.size() != 1) {
err << getName() << " requires to select a single master!";
throwInvalidUsageException(err);
}
MasterDevice m(masterIndices.front());
if (args[0] == "-") {
loadFoeData(&data, cin);
if (getOutputFile().empty()) {
@@ -128,6 +120,7 @@ void CommandFoeWrite::execute(const StringVector &args)
}
}
MasterDevice m(getSingleMasterIndex());
try {
m.open(MasterDevice::ReadWrite);
} catch (MasterDeviceException &e) {