Различные мелки оптимизационные правки

Utilities/MBTester/MBSlave.cc

@@ -88,7 +88,7 @@ void MBSlave::execute()
             //  с проверкой на переполнение
             askCount = askCount>=numeric_limits<long>::max() ? 0 : askCount+1;
             if( res!=ModbusRTU::erNoError )
-                errmap[res]++;
+                ++errmap[res];
 
             prev = res;
         }
@@ -116,11 +116,11 @@ ModbusRTU::mbErrCode MBSlave::readCoilStatus( ReadCoilMessage& query,
     d.b[6] = 1;
 
     // Фомирование ответа:
-    int bcnt = query.count / ModbusRTU::BitsPerByte;
+    unsigned int bcnt = query.count / ModbusRTU::BitsPerByte;
     if( (query.count % ModbusRTU::BitsPerByte) > 0 )
         bcnt++;
 
-    for( int i=0; i<bcnt; i++ )
+    for( unsigned int i=0; i<bcnt; i++ )
     {
         if( replyVal!=-1 )
             reply.addData(replyVal);
@@ -149,18 +149,18 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
         while( i<query.count )
         {
             reply.addData(0);
-            for( int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
+            for( unsigned int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
                 reply.setBit(bnum,nbit,d.b[nbit]);
             bnum++;
         }
     }
     else
     {
-        int bcnt = query.count / ModbusRTU::BitsPerByte;
+        unsigned int bcnt = query.count / ModbusRTU::BitsPerByte;
         if( (query.count % ModbusRTU::BitsPerByte) > 0 )
             bcnt++;
 
-        for( int i=0; i<bcnt; i++ )
+        for( unsigned int i=0; i<bcnt; i++ )
         {
             if( i == 1 )
                 reply.addData(replyVal2);

Utilities/MBTester/MBTCPServer.cc

@@ -85,7 +85,7 @@ void MBTCPServer::execute()
             //  с проверкой на переполнение
             askCount = askCount>=numeric_limits<long>::max() ? 0 : askCount+1;
             if( res!=ModbusRTU::erNoError )
-                errmap[res]++;
+                ++errmap[res];
 
             prev = res;
         }
@@ -161,7 +161,7 @@ ModbusRTU::mbErrCode MBTCPServer::readInputStatus( ReadInputStatusMessage& query
         while( i<query.count )
         {
             reply.addData(0);
-            for( int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
+            for( unsigned int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
                 reply.setBit(bnum,nbit,d.b[nbit]);
             bnum++;
         }
@@ -172,7 +172,7 @@ ModbusRTU::mbErrCode MBTCPServer::readInputStatus( ReadInputStatusMessage& query
         if( (query.count % ModbusRTU::BitsPerByte) > 0 )
             bcnt++;
 
-        for( int i=0; i<bcnt; i++ )
+        for( unsigned int i=0; i<bcnt; i++ )
             reply.addData(replyVal);
     }
 

Utilities/codegen/ctl-cpp-cc-alone-ask.xsl

@@ -62,7 +62,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 		}
 
 		// обработка сообщений (таймеров и т.п.)
-		for( int i=0; i&lt;<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
+		for( unsigned int i=0; i&lt;<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
 		{
 			if( !receiveMessage(msg) )
 				break;

Utilities/codegen/ctl-cpp-cc-alone.xsl

@@ -66,7 +66,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 		}
 
 		// обработка сообщений (таймеров и т.п.)
-		for( int i=0; i&lt;<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
+		for( unsigned int i=0; i&lt;<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
 		{
 			if( !receiveMessage(msg) )
 				break;

Utilities/codegen/ctl-cpp-cc-ask.xsl

@@ -63,7 +63,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 		}
 
 		// обработка сообщений (таймеров и т.п.)
-		for( int i=0; i&lt;<xsl:call-template name="settings"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
+		for( unsigned int i=0; i&lt;<xsl:call-template name="settings"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
 		{
 			if( !receiveMessage(msg) )
 				break;

Utilities/codegen/ctl-cpp-cc.xsl

@@ -69,7 +69,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 		}
 
 		// обработка сообщений (таймеров и т.п.)
-		for( int i=0; i&lt;<xsl:call-template name="settings"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
+		for( unsigned int i=0; i&lt;<xsl:call-template name="settings"><xsl:with-param name="varname" select="'msg-count'"/></xsl:call-template>; i++ )
 		{
 			if( !receiveMessage(msg) )
 				break;

extensions/DBServer-SQLite/SQLiteInterface.cc

@@ -254,7 +254,7 @@ SQLiteResult::SQLiteResult( sqlite3_stmt* s, bool finalize )
         int n = sqlite3_data_count(s);
         COL    c;
 
-        for( int i=0; i<n; i++ )
+        for( unsigned int i=0; i<n; i++ )
         {
             char* p = (char*)sqlite3_column_text(s,i);
             if( p )

extensions/IOControl/IOControl.cc

@@ -98,7 +98,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 
         if( cards[i] != NULL )
         {
-            for( int s=1; s<=4; s++ )
+            for( unsigned int s=1; s<=4; s++ )
             {
                 stringstream t1;
                 t1 << s1.str() << "-subdev" << s << "-type";
@@ -1594,7 +1594,7 @@ void IOControl::buildCardsList()
                 k = 2;
             
             // инициализация subdev-ов
-            for( int i=1; i<=k; i++ )
+            for( unsigned int i=1; i<=k; i++ )
             {
                 ostringstream s;
                 s << "subdev" << i;

extensions/IOControl/iotest.cc

@@ -215,7 +215,7 @@ int main(int argc, char* argv[])
         {
             if( autoconf )
             {
-                for( int k=0; chan[k]!=-1; k++ )
+                for( unsigned int k=0; chan[k]!=-1; k++ )
                 {
                     if( comedi_dio_config(card, subdev, chan[k],INSN_CONFIG_DIO_INPUT) < 0)
                     {
@@ -225,7 +225,7 @@ int main(int argc, char* argv[])
                 }
             }
 
-            for( int k=0; chan[k]!=-1; k++ )
+            for( unsigned int k=0; chan[k]!=-1; k++ )
             {
                 if( comedi_dio_read(card, subdev, chan[k],&data) < 0)
                 {
@@ -242,7 +242,7 @@ int main(int argc, char* argv[])
         {
             if( autoconf )
             {
-                for( int k=0; chan[k]!=-1; k++ )
+                for( unsigned int k=0; chan[k]!=-1; k++ )
                 {
                     if( comedi_dio_config(card, subdev, chan[k],INSN_CONFIG_DIO_OUTPUT) < 0 )
                     {
@@ -254,7 +254,7 @@ int main(int argc, char* argv[])
             // реализация мигания
             while(1)
             {
-                for( int k=0; chan[k]!=-1; k++ )
+                for( unsigned int k=0; chan[k]!=-1; k++ )
                 {
                     if( verb )
                         printf( "write: ch=%d val=%d\n",chan[k],val);
@@ -277,7 +277,7 @@ int main(int argc, char* argv[])
 
         case cmdARead:
         {
-            for( int k=0; chan[k]!=-1; k++ )
+            for( unsigned int k=0; chan[k]!=-1; k++ )
             {
                 if( autoconf )
                     insn_config(card, subdev,chan[k],100,range,aref);
@@ -296,7 +296,7 @@ int main(int argc, char* argv[])
 
         case cmdAWrite:
         {
-            for( int k=0; chan[k]!=-1; k++ )
+            for( unsigned int k=0; chan[k]!=-1; k++ )
             {
                 if( autoconf )
                     insn_config(card,subdev,chan[k],101,range,aref);
@@ -313,7 +313,7 @@ int main(int argc, char* argv[])
 
         case cmdConfig:
         {
-            for( int k=0; chan[k]!=-1; k++ )
+            for( unsigned int k=0; chan[k]!=-1; k++ )
             {
                 if( val != INSN_CONFIG_DIO_INPUT
                     && val != INSN_CONFIG_DIO_OUTPUT

extensions/LogicProcessor/TDelay.cc

@@ -13,7 +13,7 @@ TDelay::TDelay( Element::ElementID id, int delayMS, int inCount):
     if( inCount!=0 )
     {
         // создаём заданное количество входов
-        for( int i=1;i<=inCount;i++ )
+        for( unsigned int i=1;i<=inCount;i++ )
             ins.push_front(InputInfo(i,false)); // addInput(i,st);
     }
 }

extensions/LogicProcessor/TOR.cc

@@ -13,7 +13,7 @@ TOR::TOR(ElementID id, int num, bool st):
     if( num!=0 )
     {
         // создаём заданное количество входов
-        for( int i=1;i<=num;i++ )
+        for( unsigned int i=1;i<=num;i++ )
         {
             ins.push_front(InputInfo(i,st)); // addInput(i,st);
             if( st == true )

extensions/ModbusMaster/rtustate.cc

@@ -104,9 +104,9 @@ int main( int argc, char **argv )
         rtu.poll(&mb);
         cout << rtu << endl;
 
-        for( int i=0; i<24; i++ )
+        for( unsigned int i=0; i<24; i++ )
             cout << "UNIO1 AI" << i << ": " << rtu.getFloat( RTUStorage::nJ1, i, UniversalIO::AI ) << endl;
-        for( int i=0; i<24; i++ )
+        for( unsigned int i=0; i<24; i++ )
             cout << "UNIO1 DI" << i << ": " << rtu.getState( RTUStorage::nJ1, i, UniversalIO::DI ) << endl;
 
         return 0;

extensions/ModbusSlave/MBSlave.cc

@@ -390,7 +390,7 @@ void MBSlave::execute_rtu()
                 //  с проверкой на переполнение
                 askCount = askCount>=numeric_limits<long>::max() ? 0 : askCount+1;
                 if( res!=ModbusRTU::erNoError )
-                    errmap[res]++;
+                    ++errmap[res];
     
                 prev = res;
             }
@@ -469,7 +469,7 @@ void MBSlave::execute_tcp()
                 //  с проверкой на переполнение
                 askCount = askCount>=numeric_limits<long>::max() ? 0 : askCount+1;
                 if( res!=ModbusRTU::erNoError )
-                    errmap[res]++;
+                    ++errmap[res];
     
                 prev = res;
             }
@@ -818,7 +818,7 @@ bool MBSlave::initItem( UniXML_iterator& it )
         }
         p.vtype = v;
         p.wnum = 0;
-        for( int i=0; i<VTypes::wsize(p.vtype); i++ )
+        for( unsigned int i=0; i<VTypes::wsize(p.vtype); i++ )
         {
             p.mbreg += i;
             p.wnum+= i;
@@ -930,7 +930,7 @@ ModbusRTU::mbErrCode MBSlave::readOutputRegisters( ModbusRTU::ReadOutputMessage&
     ModbusRTU::mbErrCode ret = much_real_read(query.start,buf,query.count);
     if( ret == ModbusRTU::erNoError )
     {
-        for( int i=0; i<query.count; i++ )
+        for( unsigned int i=0; i<query.count; i++ )
             reply.addData( buf[i] );
     }
     
@@ -1054,7 +1054,7 @@ ModbusRTU::mbErrCode MBSlave::real_write_it( IOMap::iterator& it, ModbusRTU::Mod
         {
             RegMap::iterator i(p->reg->rit);
             ModbusRTU::ModbusData* data = new ModbusRTU::ModbusData[VTypes::F2::wsize()];
-                for( int k=0; k<VTypes::F2::wsize(); k++, i++ )
+                for( unsigned int k=0; k<VTypes::F2::wsize(); k++, i++ )
                     data[k] = i->second->mbval;
                 
                 VTypes::F2 f(data,VTypes::F2::wsize());
@@ -1067,7 +1067,7 @@ ModbusRTU::mbErrCode MBSlave::real_write_it( IOMap::iterator& it, ModbusRTU::Mod
                 RegMap::iterator i(p->reg->rit);
 
                 ModbusRTU::ModbusData* data = new ModbusRTU::ModbusData[VTypes::F4::wsize()];
-                for( int k=0; k<VTypes::F4::wsize(); k++, i++ )
+                for( unsigned int k=0; k<VTypes::F4::wsize(); k++, i++ )
                     data[k] = i->second->mbval;
                 
                 VTypes::F4 f(data,VTypes::F4::wsize());
@@ -1309,7 +1309,7 @@ mbErrCode MBSlave::readInputRegisters( ReadInputMessage& query, ReadInputRetMess
     ModbusRTU::mbErrCode ret = much_real_read(query.start,buf,query.count);
     if( ret == ModbusRTU::erNoError )
     {
-        for( int i=0; i<query.count; i++ )
+        for( unsigned int i=0; i<query.count; i++ )
             reply.addData( buf[i] );
     }
     
@@ -1373,11 +1373,11 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
         // Фомирование ответа:
         much_real_read(query.start,buf,query.count);
         int bnum = 0;
-        int i=0;
+        unsigned int i=0;
         while( i<query.count )
         {
             reply.addData(0);
-            for( int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
+            for( unsigned int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
                 reply.setBit(bnum,nbit,buf[i]);
             bnum++;
         }
@@ -1418,10 +1418,10 @@ ModbusRTU::mbErrCode MBSlave::forceMultipleCoils( ModbusRTU::ForceCoilsMessage&
 
     ModbusRTU::mbErrCode ret = ModbusRTU::erNoError;
     int nbit = 0;
-    for( int i = 0; i<query.bcnt; i++ )
+    for( unsigned int i = 0; i<query.bcnt; i++ )
     {
         ModbusRTU::DataBits b(query.data[i]);
-        for( int k=0; k<ModbusRTU::BitsPerByte && nbit<query.quant; k++, nbit++ )
+        for( unsigned int k=0; k<ModbusRTU::BitsPerByte && nbit<query.quant; k++, nbit++ )
         {
             // ModbusRTU::mbErrCode ret =     
             real_write(query.start+nbit, (b[k] ? 1 : 0) );

extensions/SharedMemory/SharedMemory.cc

@@ -493,7 +493,7 @@ void SharedMemory::sendEvent( UniSetTypes::SystemMessage& sm )
     for( EventList::iterator it=elst.begin(); it!=elst.end(); ++it )
     {
         bool ok = false;
-        for( int i=0; i<2; i++ )
+        for( unsigned int i=0; i<2; i++ )
         {
             try
             {

extensions/SharedMemoryPlus/smemory-plus.cc

@@ -65,7 +65,7 @@ int main( int argc, const char **argv )
 
         // ------------ IOControl ----------------
         std::list< ThreadCreator<IOControl>* > lst_iothr;
-        for( int i=0; i<MaxAddNum; i++ )
+        for( unsigned int i=0; i<MaxAddNum; i++ )
         {
             stringstream s;
             s << "--add-io";
@@ -95,7 +95,7 @@ int main( int argc, const char **argv )
             }
         }
         // ------------- RTU Exchange --------------
-        for( int i=0; i<MaxAddNum; i++ )
+        for( unsigned int i=0; i<MaxAddNum; i++ )
         {
             stringstream s;
             s << "--add-rtu";
@@ -119,7 +119,7 @@ int main( int argc, const char **argv )
             }
         }
         // ------------- MBSlave --------------
-        for( int i=0; i<MaxAddNum; i++ )
+        for( unsigned int i=0; i<MaxAddNum; i++ )
         {
             stringstream s;
             s << "--add-mbslave";
@@ -144,7 +144,7 @@ int main( int argc, const char **argv )
         }
 
         // ------------- MBTCPMaster --------------
-        for( int i=0; i<MaxAddNum; i++ )
+        for( unsigned int i=0; i<MaxAddNum; i++ )
         {
             stringstream s;
             s << "--add-mbmaster";

extensions/UniNetwork/UniExchange.cc

@@ -206,7 +206,7 @@ void UniExchange::NetNodeInfo::update( IOController_i::ShortMapSeq_var& map, SMI
     }
     
     int size = map->length();
-    for( int i=0; i<size; i++ )
+    for( unsigned int i=0; i<size; i++ )
     {
         SInfo* s = &(smap[i]);
         IOController_i::ShortMap* m = &(map[i]);

extensions/lib/DigitalFilter.cc

@@ -51,7 +51,7 @@ void DigitalFilter::setSettings( unsigned int bufsize, double T, double lsq,
     {
         // удаляем лишние (первые) элементы
         int sub = buf.size() - maxsize;
-        for( int i=0; i<sub; i++ )
+        for( unsigned int i=0; i<sub; i++ )
             buf.erase( buf.begin() );
     }
 

extensions/lib/MTR.cc

@@ -398,7 +398,7 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
                 << "=" << ModbusRTU::dat2str( (*it1) )  << endl;
 //            ok=true;
 //            continue;
-            for( int i=0; i<attempts; i++ )
+            for( unsigned int i=0; i<attempts; i++ )
             {
                 try
                 {

include/Mutex.h

@@ -123,6 +123,7 @@ namespace UniSetTypes
             ost::AtomicCounter wr_wait;
             static int num;
     };
+
     std::ostream& operator<<(std::ostream& os, uniset_rwmutex& m );
     // -------------------------------------------------------------------------
     class uniset_rwmutex_wrlock

src/Communications/ComPort485F.cc

@@ -116,7 +116,7 @@ unsigned char ComPort485F::m_receiveByte( bool wait )
         }
         else
         {
-            for( int i=0; i<3; i++ )
+            for( unsigned int i=0; i<3; i++ )
             {
                 rc = ::read(fd,tbuf,sizeof(tbuf));
                 if( rc > 0 )
@@ -220,7 +220,7 @@ void ComPort485F::sendByte( unsigned char x )
 // --------------------------------------------------------------------------------
 void ComPort485F::save2queue( unsigned char*msg, int len, int bnum )
 {
-    for( int i=0; i<len && i<bnum; i++ )
+    for( unsigned int i=0; i<len && i<bnum; i++ )
     {
         wq.push(msg[i]);
 //        fprintf(stderr,"save 2 squeue: %x\n",msg[i]);

src/Communications/Modbus/ModbusHelpers.cc

@@ -87,7 +87,7 @@ ComPort::Speed ModbusHelpers::autodetectSpeed( ModbusRTUMaster* m, ModbusAddr sl
 {
     ComPort::Speed cur = m->getSpeed();
     ComPort::Speed s = ComPort::ComSpeed0;
-    for( int i=0; checkSpeed[i]!=ComPort::ComSpeed0; i++ )
+    for( unsigned int i=0; checkSpeed[i]!=ComPort::ComSpeed0; i++ )
     {
         try
         {

src/Communications/Modbus/ModbusTCPCore.cc

@@ -58,7 +58,7 @@ mbErrCode ModbusTCPCore::sendData( unsigned char* buf, int len, ost::TCPStream*
 
     try
     {
-        for( int i=0; i<len; i++ )
+        for( unsigned int i=0; i<len; i++ )
             (*tcp) << buf[i];
 
         return erNoError;

src/Communications/Modbus/ModbusTCPMaster.cc

@@ -102,7 +102,7 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
             dlog(Debug::INFO) << endl;
         }
 
-        for( int i=0; i<2; i++ )
+        for( unsigned int i=0; i<2; i++ )
         {
             (*tcp) << mh;
 
@@ -154,7 +154,7 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
             memset(rbuf,0,sizeof(rbuf));
             int ret = getNextData(rbuf,sizeof(rbuf));
             cerr << "ret=" << ret << " recv: ";
-            for( int i=0; i<sizeof(rbuf); i++ )
+            for( unsigned int i=0; i<sizeof(rbuf); i++ )
                 cerr << hex << " 0x" <<  (int)rbuf[i];
             cerr << endl;
 */

src/Communications/Modbus/ModbusTCPTypes.cc

@@ -161,7 +161,7 @@ std::ostream& ModbusRTU::mbPrintMessage( std::ostream& os, ModbusByte* m, int le
 
     // << setiosflags(ios::showbase) // для вывода в формате 0xNN
     s << hex << showbase << setfill('0'); // << showbase;
-    for( int i=0; i<len; i++ )
+    for( unsigned int i=0; i<len; i++ )
         s << setw(2) << (short)(m[i]) << " ";
 //        s << "<" << setw(2) << (int)(m[i]) << ">";
 
@@ -356,7 +356,7 @@ DataBits::operator ModbusByte()
 ModbusByte DataBits::mbyte()
 {
     ModbusByte ubyte = 0;
-    for( int i=0; i<b.size(); i++ )
+    for( unsigned int i=0; i<b.size(); i++ )
     {
         if( b[i] )
             ubyte |= 1<<i;
@@ -367,7 +367,7 @@ ModbusByte DataBits::mbyte()
 // -------------------------------------------------------------------------
 const DataBits& DataBits::operator=( const ModbusByte& r )
 {
-    for( int i=0; i<b.size(); i++ )
+    for( unsigned int i=0; i<b.size(); i++ )
         b[i] = r&(1<<i);
 
     return (*this);
@@ -376,7 +376,7 @@ const DataBits& DataBits::operator=( const ModbusByte& r )
 std::ostream& ModbusRTU::operator<<(std::ostream& os, DataBits& d )
 {
     os << "[";
-    for( int i=d.b.size()-1; i>=0; i-- )
+    for( unsigned int i=d.b.size()-1; i>=0; i-- )
         os << d.b[i];
     os << "]";
 
@@ -412,7 +412,7 @@ DataBits16::operator ModbusData()
 ModbusData DataBits16::mdata()
 {
     ModbusData udata = 0;
-    for( int i=0; i<b.size(); i++ )
+    for( unsigned int i=0; i<b.size(); i++ )
     {
         if( b[i] )
             udata |= 1<<i;
@@ -423,7 +423,7 @@ ModbusData DataBits16::mdata()
 // -------------------------------------------------------------------------
 const DataBits16& DataBits16::operator=( const ModbusData& r )
 {
-    for( int i=0; i<b.size(); i++ )
+    for( unsigned int i=0; i<b.size(); i++ )
         b[i] = r&(1<<i);
 
     return (*this);
@@ -432,7 +432,7 @@ const DataBits16& DataBits16::operator=( const ModbusData& r )
 std::ostream& ModbusRTU::operator<<(std::ostream& os, DataBits16& d )
 {
     os << "[";
-    for( int i=d.b.size()-1; i>=0; i-- )
+    for( unsigned int i=d.b.size()-1; i>=0; i-- )
         os << d.b[i];
     os << "]";
 
@@ -876,7 +876,7 @@ void ReadOutputRetMessage::init( ModbusMessage& m )
     memcpy(&data,&(m.data[1]),bcnt);
 
     // переворачиваем данные
-    for( int i=0; i<cnt; i++ )
+    for( unsigned int i=0; i<cnt; i++ )
         data[i] = SWAPSHORT(data[i]);
 
      memcpy(&crc,&(m.data[bcnt+1]),szCRC);
@@ -943,7 +943,7 @@ ModbusMessage ReadOutputRetMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -1088,7 +1088,7 @@ void ReadInputRetMessage::init( ModbusMessage& m )
     memcpy(&data,&(m.data[1]),bcnt);
 
     // переворачиваем данные
-    for( int i=0; i<cnt; i++ )
+    for( unsigned int i=0; i<cnt; i++ )
         data[i] = SWAPSHORT(data[i]);
 
      memcpy(&crc,&(m.data[bcnt+1]),szCRC);
@@ -1145,7 +1145,7 @@ ModbusMessage ReadInputRetMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -1259,7 +1259,7 @@ ModbusMessage ForceCoilsMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[quant];
-    for( int i=0; i<quant; i++ )
+    for( unsigned int i=0; i<quant; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем данные
@@ -1325,7 +1325,7 @@ void ForceCoilsMessage::init( ModbusMessage& m )
     // последний элемент это CRC
     memcpy(&crc,&(m.data[m.len-szCRC]),szCRC);
 
-    for( int i=0; i<quant; i++ )
+    for( unsigned int i=0; i<quant; i++ )
         data[i] = SWAPSHORT(data[i]);
 }
 // -------------------------------------------------------------------------
@@ -1356,7 +1356,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ForceCoilsMessage& m )
         << " bcnt=" << b2str(m.bcnt)
         << " data[" << (int)m.quant <<"]={ ";
 
-    for( int i=0; i<m.quant; i++ )
+    for( unsigned int i=0; i<m.quant; i++ )
     {
         DataBits16 d(m.data[i]);
         os << "" << d << "  ";
@@ -1504,7 +1504,7 @@ ModbusMessage WriteOutputMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[quant];
-    for( int i=0; i<quant; i++ )
+    for( unsigned int i=0; i<quant; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем данные
@@ -1571,7 +1571,7 @@ void WriteOutputMessage::init( ModbusMessage& m )
     memcpy(&crc,&(m.data[m.len-szCRC]),szCRC);
 
     int count( bcnt/sizeof(ModbusData) );
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         data[i] = SWAPSHORT(data[i]);
 }
 // -------------------------------------------------------------------------
@@ -1616,7 +1616,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, WriteOutputMessage& m )
         << " bcnt=" << dat2str(m.bcnt)
         << " data[" << (int)m.quant <<"]={ ";
 
-    for( int i=0; i<m.quant; i++ )
+    for( unsigned int i=0; i<m.quant; i++ )
         os << "" << dat2str(m.data[i]) << "  ";
 
     os << "}";
@@ -2150,7 +2150,7 @@ ModbusMessage JournalCommandRetMessage::transport_msg()
     // --------------------
     // копирование с переворотом данных (для ModbusData)
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -2652,7 +2652,7 @@ void ReadFileRecordMessage::init( ModbusMessage& m )
     memcpy(&crc,&(m.data[m.len-szCRC]),szCRC);
 
     count = bcnt/sizeof(SubRequest);
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
     {
         data[i].numfile = SWAPSHORT(data[i].numfile);
         data[i].numrec = SWAPSHORT(data[i].numrec);

src/Communications/Modbus/ModbusTypes.cc

@@ -177,7 +177,7 @@ std::ostream& ModbusRTU::mbPrintMessage( std::ostream& os, ModbusByte* m, int le
 
     // << setiosflags(ios::showbase) // для вывода в формате 0xNN
     s << hex << showbase << setfill('0'); // << showbase;
-    for( int i=0; i<len; i++ )
+    for( unsigned int i=0; i<len; i++ )
         s << setw(2) << (short)(m[i]) << " ";
 //        s << "<" << setw(2) << (int)(m[i]) << ">";
 
@@ -392,7 +392,7 @@ const DataBits& DataBits::operator=( const ModbusByte& r )
 std::ostream& ModbusRTU::operator<<(std::ostream& os, DataBits& d )
 {
     os << "[";
-    for( int i = (int)d.b.size()-1; i>=0; i-- )
+    for( unsigned int i = (int)d.b.size()-1; i>=0; i-- )
         os << d.b[i];
     os << "]";
 
@@ -448,7 +448,7 @@ const DataBits16& DataBits16::operator=( const ModbusData& r )
 std::ostream& ModbusRTU::operator<<(std::ostream& os, DataBits16& d )
 {
     os << "[";
-    for( int i=(int)d.b.size()-1; i>=0; i-- )
+    for( unsigned int i=(int)d.b.size()-1; i>=0; i-- )
         os << d.b[i];
     os << "]";
 
@@ -964,7 +964,7 @@ ModbusMessage ReadOutputRetMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -1120,7 +1120,7 @@ void ReadInputRetMessage::init( ModbusMessage& m )
 void ReadInputRetMessage::swapData()
 {
     // переворачиваем данные
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         data[i] = SWAPSHORT(data[i]);
 }
 // -------------------------------------------------------------------------
@@ -1175,7 +1175,7 @@ ModbusMessage ReadInputRetMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -1392,7 +1392,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ForceCoilsMessage& m )
         << " bcnt=" << b2str(m.bcnt)
         << " data[" << (int)m.quant <<"]={ ";
 
-    for( int i=0; i<m.bcnt; i++ )
+    for( unsigned int i=0; i<m.bcnt; i++ )
     {
         DataBits d(m.data[i]);
         os << "" << d << "  ";
@@ -1540,7 +1540,7 @@ ModbusMessage WriteOutputMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[quant];
-    for( int i=0; i<quant; i++ )
+    for( unsigned int i=0; i<quant; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем данные
@@ -1607,7 +1607,7 @@ void WriteOutputMessage::init( ModbusMessage& m )
     memcpy(&crc,&(m.data[m.len-szCRC]),szCRC);
 
     int count( bcnt/sizeof(ModbusData) );
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         data[i] = SWAPSHORT(data[i]);
 }
 // -------------------------------------------------------------------------
@@ -1652,7 +1652,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, WriteOutputMessage& m )
         << " bcnt=" << dat2str(m.bcnt)
         << " data[" << (int)m.quant <<"]={ ";
 
-    for( int i=0; i<m.quant; i++ )
+    for( unsigned int i=0; i<m.quant; i++ )
         os << "" << dat2str(m.data[i]) << "  ";
 
     os << "}";
@@ -2179,7 +2179,7 @@ void DiagnosticMessage::init( ModbusMessage& m )
     last +=sizeof(ModbusData)*count;
 
     // переворачиваем данные
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         data[i] = SWAPSHORT(data[i]);
 
      memcpy(&crc,&(m.data[last]),szCRC);
@@ -2244,7 +2244,7 @@ ModbusMessage DiagnosticMessage::transport_msg()
 
     // Создаём временно массив, переворачиваем байты
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -2295,7 +2295,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, DiagnosticMessage& m )
                 << " subf=" << dat2str(m.subf)
             << " data[" << m.count << "]={";
 
-    for( int i=0; i<m.count; i++ )
+    for( unsigned int i=0; i<m.count; i++ )
         os << dat2str(m.data[i]) << "  ";
 
     os << "}";
@@ -2315,7 +2315,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, DiagnosticRetMessage& m )
                 << " subf=" << dat2str(m.subf)
                 << " data[" << m.count << "]={";
 
-    for( int i=0; i<m.count; i++ )
+    for( unsigned int i=0; i<m.count; i++ )
         os << dat2str(m.data[i]) << "  ";
 
     os << "}";
@@ -2441,7 +2441,7 @@ RDIObjectInfo::RDIObjectInfo( ModbusByte id, ModbusByte* dat, ModbusByte len ):
 {
     val.reserve(len);
 
-    for( int i=0; i<len; i++ )
+    for( unsigned int i=0; i<len; i++ )
         val.push_back( (char)dat[i] );
 }
 // -------------------------------------------------------------------------
@@ -2739,7 +2739,7 @@ ModbusMessage JournalCommandRetMessage::transport_msg()
     // --------------------
     // копирование с переворотом данных (для ModbusData)
     ModbusData* dtmp = new ModbusData[count];
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
         dtmp[i] = SWAPSHORT(data[i]);
 
     // копируем
@@ -3241,7 +3241,7 @@ void ReadFileRecordMessage::init( ModbusMessage& m )
     memcpy(&crc,&(m.data[m.len-szCRC]),szCRC);
 
     count = bcnt/sizeof(SubRequest);
-    for( int i=0; i<count; i++ )
+    for( unsigned int i=0; i<count; i++ )
     {
         data[i].numfile = SWAPSHORT(data[i].numfile);
         data[i].numrec = SWAPSHORT(data[i].numrec);

src/ObjectRepository/ObjectIndex_Array.cc

@@ -86,7 +86,7 @@ std::ostream& operator<<(std::ostream& os, ObjectIndex_Array& oi )
 
 std::ostream& ObjectIndex_Array::printMap( std::ostream& os )
 {
-    for( int i=0;;i++)
+    for( unsigned int i=0;;i++)
     {
         if( !objectInfo[i].repName )
             break;

src/ObjectRepository/ObjectRepository.cc

@@ -104,7 +104,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
     
     CosNaming::Name_var oName = omniURI::stringToName(name.c_str());
     CosNaming::NamingContext_var ctx;
-    for( int i=0; i<2; i++ )
+    for( unsigned int i=0; i<2; i++ )
     {
         try
         {

src/ObjectRepository/ProxyManager.cc

@@ -77,7 +77,7 @@ bool ProxyManager::activateObject()
     {
         try
         {
-            for( int i=0; i<2; i++ )
+            for( unsigned int i=0; i<2; i++ )
             {        
                 try
                 {

src/ObjectRepository/UniSetManager.cc

@@ -458,7 +458,7 @@ int UniSetManager::objectsCount()
 int UniSetManager::getObjectsInfo( UniSetManager* mngr, SimpleInfoSeq* seq, 
                                     int begin, const long uplimit )
 {
-    int ind = begin;
+    unsigned int ind = begin;
 
     // получаем у самого менджера
     SimpleInfo_var msi=mngr->getInfo();

src/ObjectRepository/UniSetObject.cc

@@ -341,7 +341,7 @@ void UniSetObject::registered()
 
     try
     {
-        for( int i=0; i<2; i++ )
+        for( unsigned int i=0; i<2; i++ )
         {
             try
             {

src/Processes/IOController.cc

@@ -384,7 +384,7 @@ void IOController::ioRegistration( const USensorInfo& ainf, bool force )
 
     try
     {
-        for( int i=0; i<2; i++ )
+        for( unsigned int i=0; i<2; i++ )
         {
             try
             {
@@ -478,7 +478,7 @@ IOController_i::SensorInfoSeq* IOController::getSensorsMap()
     IOController_i::SensorInfoSeq* res = new IOController_i::SensorInfoSeq();    
     res->length( ioList.size());
 
-    int i=0;
+    unsigned int i=0;
     for( IOStateList::iterator it=ioList.begin(); it!=ioList.end(); ++it)
     {    
         uniset_rwmutex_rlock lock(it->second.val_lock);
@@ -673,7 +673,7 @@ IOController_i::SensorInfoSeq* IOController::getSensorSeq( const IDSeq& lst )
     IOController_i::SensorInfoSeq* res = new IOController_i::SensorInfoSeq();
     res->length(size);
 
-    for( int i=0; i<size; i++ )
+    for( unsigned int i=0; i<size; i++ )
     {
         IOStateList::iterator it = ioList.find( UniSetTypes::key(lst[i],conf->getLocalNode()) );
         if( it!=ioList.end() )

src/Processes/IONotifyController.cc

@@ -894,7 +894,7 @@ IONotifyController_i::ThresholdList* IONotifyController::getThresholds( const IO
 
     res->tlist.length( it->second.list.size() );
 
-    int k=0;
+    unsigned int k=0;
     for( ThresholdExtList::const_iterator it2= it->second.list.begin(); it2!=it->second.list.end(); ++it2 )
     {
         res->tlist[k].id         = it2->id;
@@ -917,7 +917,7 @@ IONotifyController_i::ThresholdsListSeq* IONotifyController::getThresholdsList()
 
     if( !askTMap.empty() )
     {
-        int i=0;
+        unsigned int i=0;
         for( AskThresholdMap::iterator it=askTMap.begin(); it!=askTMap.end(); ++it )
         {
             try
@@ -936,7 +936,7 @@ IONotifyController_i::ThresholdsListSeq* IONotifyController::getThresholdsList()
 
             (*res)[i].tlist.length( it->second.list.size() );
 
-            int k=0;
+            unsigned int k=0;
             for( ThresholdExtList::const_iterator it2= it->second.list.begin(); it2!=it->second.list.end(); ++it2 )
             {
                 (*res)[i].tlist[k].id             = it2->id;

src/Various/SViewer.cc

@@ -281,7 +281,7 @@ void SViewer::updateThresholds( IONotifyController_i::ThresholdsListSeq_var& tls
         cout << " | " << setw(60) << sname << " | " << setw(5) << tlst[i].value << endl;
 
         int m = tlst[i].tlist.length();
-        for( int k=0; k<m; k++ )
+        for( unsigned int k=0; k<m; k++ )
         {
             IONotifyController_i::ThresholdInfo* ti = &tlst[i].tlist[k];
             cout << "\t(" << setw(3) << ti->id << ")  |  " << ti->state << "  |  hi: " << setw(5) << ti->hilimit;

src/Various/UniXML.cc

@@ -267,7 +267,7 @@ xmlNode* UniXML::findNodeUtf8( xmlNode* node, const string& searchnode, const st
 //depth means number of times we can go to the children, if 0 we can't go only to elements of the same level
 xmlNode* UniXML::extFindNode( xmlNode* node, int depth, int width, const string& searchnode, const string& name, bool top ) const
 {
-    int i=0;
+    unsigned int i=0;
     xmlNode* fnode = node;
     while( fnode != NULL )
     {