tool/CommandSdos.cpp
changeset 1869 14f634f5b613
parent 1827 489be2180f71
child 1968 4f682084c643
equal deleted inserted replaced
1868:489ea0becd74 1869:14f634f5b613
    87 
    87 
    88 /****************************************************************************/
    88 /****************************************************************************/
    89 
    89 
    90 void CommandSdos::execute(const StringVector &args)
    90 void CommandSdos::execute(const StringVector &args)
    91 {
    91 {
       
    92 	MasterIndexList masterIndices;
    92     SlaveList slaves;
    93     SlaveList slaves;
    93     SlaveList::const_iterator si;
    94     SlaveList::const_iterator si;
    94     bool showHeader, multiMaster;
    95     bool showHeader, multiMaster;
    95 
    96 
    96     if (args.size()) {
    97     if (args.size()) {
    97         stringstream err;
    98         stringstream err;
    98         err << "'" << getName() << "' takes no arguments!";
    99         err << "'" << getName() << "' takes no arguments!";
    99         throwInvalidUsageException(err);
   100         throwInvalidUsageException(err);
   100     }
   101     }
   101 
   102 
   102     multiMaster = getMasterIndices().size() > 1;
   103 	masterIndices = getMasterIndices();
       
   104     multiMaster = masterIndices.size() > 1;
   103     MasterIndexList::const_iterator mi;
   105     MasterIndexList::const_iterator mi;
   104     for (mi = getMasterIndices().begin();
   106     for (mi = masterIndices.begin();
   105             mi != getMasterIndices().end(); mi++) {
   107             mi != masterIndices.end(); mi++) {
   106         MasterDevice m(*mi);
   108         MasterDevice m(*mi);
   107         m.open(MasterDevice::Read);
   109         m.open(MasterDevice::Read);
   108         slaves = selectedSlaves(m);
   110         slaves = selectedSlaves(m);
   109         showHeader = multiMaster || slaves.size() > 1;
   111         showHeader = multiMaster || slaves.size() > 1;
   110 
   112