Complain about given arguments if none are required.

This commit is contained in:
Florian Pose
2009-03-19 08:43:05 +00:00
parent 5f7cd5eb46
commit 87cedad13f
10 changed files with 58 additions and 0 deletions

View File

@@ -105,6 +105,12 @@ void CommandConfig::execute(MasterDevice &m, const StringVector &args)
{
ConfigList configs;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
configs = selectedConfigs(m);

View File

@@ -68,6 +68,12 @@ void CommandData::execute(MasterDevice &m, const StringVector &args)
DomainList domains;
DomainList::const_iterator di;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
domains = selectedDomains(m);

View File

@@ -94,6 +94,12 @@ void CommandDomains::execute(MasterDevice &m, const StringVector &args)
DomainList domains;
DomainList::const_iterator di;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
domains = selectedDomains(m);

View File

@@ -66,6 +66,11 @@ void CommandMaster::execute(MasterDevice &m, const StringVector &args)
stringstream err;
unsigned int i;
if (args.size()) {
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
m.getMaster(&data);

View File

@@ -94,6 +94,12 @@ void CommandPdos::execute(MasterDevice &m, const StringVector &args)
SlaveList::const_iterator si;
bool showHeader;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);
showHeader = slaves.size() > 1;

View File

@@ -85,6 +85,12 @@ void CommandSdos::execute(MasterDevice &m, const StringVector &args)
SlaveList::const_iterator si;
bool showHeader;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);
showHeader = slaves.size() > 1;

View File

@@ -83,6 +83,11 @@ void CommandSiiRead::execute(MasterDevice &m, const StringVector &args)
uint16_t categoryType, categorySize;
stringstream err;
if (args.size()) {
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);

View File

@@ -109,6 +109,12 @@ void CommandSlaves::execute(MasterDevice &m, const StringVector &args)
{
SlaveList slaves;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);

View File

@@ -56,6 +56,12 @@ string CommandVersion::helpString() const
void CommandVersion::execute(MasterDevice &m, const StringVector &args)
{
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
cout << "IgH EtherCAT master " << EC_MASTER_VERSION << endl;
}

View File

@@ -73,6 +73,12 @@ void CommandXml::execute(MasterDevice &m, const StringVector &args)
SlaveList slaves;
SlaveList::const_iterator si;
if (args.size()) {
stringstream err;
err << "'" << getName() << "' takes no arguments!";
throwInvalidUsageException(err);
}
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);