Removed tabs.
--- a/tool/Command.cpp Fri Mar 19 12:40:08 2010 +0100
+++ b/tool/Command.cpp Fri Mar 19 12:41:32 2010 +0100
@@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
+ * vim: expandtab
+ *
****************************************************************************/
#include "Command.h"
@@ -189,35 +191,35 @@
Command::MasterIndexList Command::getMasterIndices() const
{
- MasterIndexList indices;
+ MasterIndexList indices;
try {
MasterIndexParser p;
indices = p.parse(masters.c_str());
} catch (MasterDeviceException &e) {
- stringstream err;
- err << "Failed to obtain number of masters: " << e.what();
- throwCommandException(err);
+ stringstream err;
+ err << "Failed to obtain number of masters: " << e.what();
+ throwCommandException(err);
} catch (runtime_error &e) {
- stringstream err;
+ stringstream err;
err << "Invalid master argument '" << masters << "': " << e.what();
- throwInvalidUsageException(err);
- }
-
- return indices;
+ throwInvalidUsageException(err);
+ }
+
+ return indices;
}
/*****************************************************************************/
unsigned int Command::getSingleMasterIndex() const
{
- MasterIndexList masterIndices = getMasterIndices();
+ MasterIndexList masterIndices = getMasterIndices();
if (masterIndices.size() != 1) {
- stringstream err;
+ stringstream err;
err << getName() << " requires to select a single master!";
throwInvalidUsageException(err);
}
- return masterIndices.front();
+ return masterIndices.front();
}
/*****************************************************************************/
--- a/tool/CommandConfig.cpp Fri Mar 19 12:40:08 2010 +0100
+++ b/tool/CommandConfig.cpp Fri Mar 19 12:41:32 2010 +0100
@@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
+ * vim: expandtab
+ *
****************************************************************************/
#include <list>
@@ -104,7 +106,7 @@
*/
void CommandConfig::execute(const StringVector &args)
{
- MasterIndexList masterIndices;
+ MasterIndexList masterIndices;
bool doIndent;
ConfigList configs;
@@ -114,7 +116,7 @@
throwInvalidUsageException(err);
}
- masterIndices = getMasterIndices();
+ masterIndices = getMasterIndices();
doIndent = masterIndices.size() > 1;
MasterIndexList::const_iterator mi;
for (mi = masterIndices.begin();
--- a/tool/CommandData.cpp Fri Mar 19 12:40:08 2010 +0100
+++ b/tool/CommandData.cpp Fri Mar 19 12:41:32 2010 +0100
@@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
+ * vim: expandtab
+ *
****************************************************************************/
#include <iostream>
@@ -66,7 +68,7 @@
void CommandData::execute(const StringVector &args)
{
- MasterIndexList masterIndices;
+ MasterIndexList masterIndices;
DomainList domains;
DomainList::const_iterator di;
@@ -76,7 +78,7 @@
throwInvalidUsageException(err);
}
- masterIndices = getMasterIndices();
+ masterIndices = getMasterIndices();
MasterIndexList::const_iterator mi;
for (mi = masterIndices.begin();
mi != masterIndices.end(); mi++) {
--- a/tool/CommandDebug.cpp Fri Mar 19 12:40:08 2010 +0100
+++ b/tool/CommandDebug.cpp Fri Mar 19 12:41:32 2010 +0100
@@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
+ * vim: expandtab
+ *
****************************************************************************/
#include <sstream>