Вторая проверка статическим анализатором, make style

Utilities/Admin/admin.cc

@@ -348,7 +348,7 @@ int main(int argc, char** argv)
 
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( !quiet )
 			cout << "admin(main): " << ex << endl;
@@ -517,7 +517,7 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
 					}
 				}
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				if( !quiet )
 					cerr << setw(55) << ob << "   <--- " << ex << endl;
@@ -574,7 +574,7 @@ int omap()
 		uniset_conf()->oind->printMap(cout);
 		cout << "==========================================================================\n";
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( !quiet )
 			cerr << " configuration init failed: " << ex << endl;
@@ -639,7 +639,7 @@ int setValue( const string& args, UInterface& ui )
 					break;
 			}
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			if( !quiet )
 				cerr << "(setValue): " << ex << endl;;
@@ -706,7 +706,7 @@ int getValue( const string& args, UInterface& ui )
 					break;
 			}
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			if( !quiet )
 				cerr << "(getValue): " << ex << endl;
@@ -755,7 +755,7 @@ int getCalibrate( const std::string& args, UInterface& ui )
 			else
 				cout << ci;
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			if( !quiet )
 				cerr << "(getCalibrate): " << ex << endl;;
@@ -800,7 +800,7 @@ int getRawValue( const std::string& args, UInterface& ui )
 			else
 				cout << ui.getRawValue(it.si);
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			if( !quiet )
 				cerr << "(getRawValue): " << ex << endl;;
@@ -845,7 +845,7 @@ int getChangedTime( const std::string& args, UInterface& ui )
 			else
 				cout << ui.getChangedTime(it.si.id, it.si.node);
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			if( !quiet )
 				cerr << "(getChangedTime): " << ex << endl;;
@@ -913,9 +913,11 @@ int logRotate( const string& arg, UInterface& ui )
 	else // посылка определённому объекту
 	{
 		UniSetTypes::ObjectId id = conf->getObjectID(arg);
+
 		if( id == DefaultObjectId )
 			id = conf->getControllerID(arg);
-		else if( id == DefaultObjectId )
+
+		if( id == DefaultObjectId )
 			id = conf->getServiceID(arg);
 
 		if( id == DefaultObjectId )
@@ -953,6 +955,7 @@ int configure( const string& arg, UInterface& ui )
 	else // посылка определённому объекту
 	{
 		UniSetTypes::ObjectId id = conf->getObjectID(arg);
+
 		if( id == DefaultObjectId )
 			id = conf->getControllerID(arg);
 
@@ -1004,7 +1007,7 @@ int oinfo( const string& args, UInterface& ui, int userparam )
 				cout << inf->info << endl;
 			}
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			if( !quiet )
 				cout << "ID='" << it.id << "' ERROR: " << ex << endl;

Utilities/MBTester/mbtcpconnection.cc

@@ -215,7 +215,7 @@ int main( int argc, char** argv )
 	{
 		cerr << "(mbtester): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(mbtester): " << ex << endl;
 	}

Utilities/MBTester/mbtcptester.cc

@@ -713,7 +713,7 @@ int main( int argc, char** argv )
 	{
 		cerr << "(mbtester): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(mbtester): " << ex << endl;
 	}

Utilities/SImitator/main.cc

@@ -135,7 +135,7 @@ int main( int argc, char** argv )
 					{
 						ui.setValue(it.si, j, DefaultObjectId);
 					}
-					catch( const Exception& ex )
+					catch( const UniSetTypes::Exception& ex )
 					{
 						cerr << endl << "save id=" << it.fname << " " << ex << endl;
 					}
@@ -162,7 +162,7 @@ int main( int argc, char** argv )
 					{
 						ui.setValue(it->si, i, DefaultObjectId);
 					}
-					catch( const Exception& ex )
+					catch( const UniSetTypes::Exception& ex )
 					{
 						cerr << endl << "save id=" << it->fname << " " << ex << endl;
 					}
@@ -172,7 +172,7 @@ int main( int argc, char** argv )
 			msleep(amsec);
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << endl << "(simitator): " << ex << endl;
 		return 1;

Utilities/SMonit/smonitor.cc

@@ -47,7 +47,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cout << "(main):" << ex << endl;
 	}

Utilities/ULog/log-stdin.cc

@@ -94,7 +94,7 @@ int main( int argc, char* argv[], char* envp[] )
 		cerr << "(log-stdin): " << err << endl;
 		return 1;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(log-stdin): " << ex << endl;
 		return 1;

Utilities/ULog/log-wrap.cc

@@ -105,7 +105,7 @@ int main( int argc, char* argv[], char* envp[] )
 		cerr << "(logserver-wrap): " << err << endl;
 		return 1;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(logserver-wrap): " << ex << endl;
 		return 1;

Utilities/ULog/log.cc

@@ -317,7 +317,7 @@ int main( int argc, char** argv )
 	{
 		cerr << "(log): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(log): " << ex << endl;
 	}

Utilities/ULog/logserver.cc

@@ -209,7 +209,7 @@ int main( int argc, char** argv )
 	{
 		cerr << "(logserver): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(logserver): " << ex << endl;
 	}

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

@@ -85,7 +85,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexcept
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( const Exception&amp; ex )
+			catch( const UniSetTypes::Exception&amp; ex )
 			{
 				mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}
@@ -95,7 +95,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexcept
 		updateOutputs(forceOut);
 		updatePreviousValues();
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 	}
@@ -206,7 +206,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
 		</xsl:for-each>
 			return;
 		}
-		catch( const Exception&amp; ex )
+		catch( const UniSetTypes::Exception&amp; ex )
 		{
             mycrit &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
 		}
@@ -267,7 +267,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
 
 		return ui->getValue(_sid);
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
 		mycrit &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -321,7 +321,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
 </xsl:if>
 </xsl:if>
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
 		mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -356,7 +356,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
 				si.node = node_<xsl:value-of select="../../@name"/>;
 				ui->setValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, getId() );
 			}
-			catch( const Exception&amp; ex )
+			catch( const UniSetTypes::Exception&amp; ex )
 			{
 				mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
 				throw;
@@ -371,7 +371,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
 		si.node = node_<xsl:value-of select="../../@name"/>;
 		ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
 		mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;

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

@@ -88,7 +88,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexept
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( const Exception&amp; ex )
+			catch( const UniSetTypes::Exception&amp; ex )
 			{
 				mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}
@@ -100,7 +100,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexept
 		// обновление списка предыдущих состояний
 		updatePreviousValues();
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
 		mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 	}
@@ -109,7 +109,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexept
 		mycrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
 			&lt;&lt; ex.NP_minorString() &lt;&lt; endl;
 	}
-	catch( const std::exception&amp;ex )
+	catch( const std::exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what()  &lt;&lt;  endl;
 	}
@@ -261,7 +261,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
 </xsl:if>
 </xsl:if>
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -296,7 +296,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
 		si.node = node_<xsl:value-of select="../../@name"/>;
 		ui->setValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, getId() );
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -311,7 +311,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
 		si.node = node_<xsl:value-of select="../../@name"/>;
 		ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;

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

@@ -85,7 +85,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexcept
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( const Exception&amp; ex )
+			catch( const UniSetTypes::Exception&amp; ex )
 			{
 				mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}
@@ -95,7 +95,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexcept
 		updateOutputs(forceOut);
 		updatePreviousValues();
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 	}
@@ -104,7 +104,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexcept
         mycrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
                 &lt;&lt; ex.NP_minorString() &lt;&lt; endl;
 	}
-    catch( const std::exception&amp;ex )
+    catch( const std::exception&amp; ex )
     {
         mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what()  &lt;&lt;   endl;
     }
@@ -221,7 +221,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
 
 		return ui->getValue(_sid);
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -256,7 +256,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
 		</xsl:for-each>
 			return;
 		}
-		catch( const Exception&amp; ex )
+		catch( const UniSetTypes::Exception&amp; ex )
 		{
             mycrit &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
 		}

Utilities/codegen/ctl-cpp-cc.xsl

@@ -88,7 +88,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexept
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( const Exception&amp; ex )
+			catch( const UniSetTypes::Exception&amp; ex )
 			{
 				mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}
@@ -98,7 +98,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() noexept
 		updateOutputs(forceOut);
 		updatePreviousValues();
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 	}
@@ -221,7 +221,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 		if( <xsl:value-of select="@name"/> != DefaultObjectId )
             priv_<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui->getValue(<xsl:value-of select="@name"/>,node_<xsl:value-of select="@name"/>);
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -238,7 +238,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 			ui->setValue( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>, getId() );
 		}
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -256,7 +256,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 			ui->setValue( si,<xsl:value-of select="$setval"/>, getId() );
 		}
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
 		throw;
@@ -273,7 +273,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
 			ui->setValue( si,(long)m_<xsl:value-of select="@name"/>, getId() );
 		}
 	}
-	catch( const Exception&amp; ex )
+	catch( const UniSetTypes::Exception&amp; ex )
 	{
         mycrit &lt;&lt; myname &lt;&lt; "(setmsg): " &lt;&lt; ex &lt;&lt; endl;
 		throw;

Utilities/codegen/ctl-cpp-common.xsl

@@ -73,7 +73,7 @@
 		</xsl:when>
 		<xsl:when test="$GENTYPE='CHECK'">
 		<xsl:if test="normalize-space(@vartype)!='io'">
-			<xsl:if test="normalize-space(../../@id)=''">throw SystemException("Not Found ID for <xsl:value-of select="../../@name"/>");</xsl:if>
+			<xsl:if test="normalize-space(../../@id)=''">throw UniSetTypes::SystemError("Not Found ID for <xsl:value-of select="../../@name"/>");</xsl:if>
 		</xsl:if>
 		</xsl:when>
 		</xsl:choose>
@@ -672,7 +672,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 //		abort();
 //		raise(SIGTERM);
 		std::terminate();
-//		throw SystemError(err.str());
+//		throw UniSetTypes::SystemError(err.str());
 	}
 
 	if( !ui->waitWorking(_testID,wait_msec) )
@@ -687,7 +687,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 //		abort();
 		//raise(SIGTERM);
 		std::terminate();
-//		throw SystemError(err.str());
+//		throw UniSetTypes::SystemError(err.str());
 	}
 }
 // ----------------------------------------------------------------------------
@@ -864,7 +864,7 @@ forceOut(false),
 end_private(false)
 {
 	mycrit &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
-	throw Exception( string(myname+": init failed!!!") );
+	throw UniSetTypes::Exception( string(myname+": init failed!!!") );
 }
 // -----------------------------------------------------------------------------
 // ( val, confval, default val )
@@ -952,7 +952,7 @@ end_private(false)
 	{
 		ostringstream err;
 		err &lt;&lt; "(<xsl:value-of select="$CLASSNAME"/>::init): Unknown ObjectID!";
-		throw SystemError( err.str() );
+		throw UniSetTypes::SystemError( err.str() );
 	}
 
     mylog = make_shared&lt;DebugStream&gt;();
@@ -973,13 +973,13 @@ end_private(false)
 <xsl:for-each select="//smap/item">
 	<xsl:if test="normalize-space(@no_check_id)!='1'">
 	if( <xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
-		throw Exception( myname + ": Not found ID for (<xsl:value-of select="@name"/>) " + conf->getProp(cnode,"<xsl:value-of select="@name"/>") );
+		throw UniSetTypes::SystemError( myname + ": Not found ID for (<xsl:value-of select="@name"/>) " + conf->getProp(cnode,"<xsl:value-of select="@name"/>") );
 	
 	</xsl:if>
 
 	<xsl:if test="normalize-space(@no_check_id)!='1'">
 	if( node_<xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
-		throw Exception( myname + ": Not found NodeID for (node='node_<xsl:value-of select="normalize-space(@name)"/>') " + conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>") );
+		throw UniSetTypes::SystemError( myname + ": Not found NodeID for (node='node_<xsl:value-of select="normalize-space(@name)"/>') " + conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>") );
 	</xsl:if>
 
 	<xsl:if test="normalize-space($VARMAP)='1'">
@@ -999,11 +999,11 @@ end_private(false)
 	if( <xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
 	{
 		if( !conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>").empty() )
-			throw Exception( myname + ": Not found Message::NodeID for (node='node_<xsl:value-of select="normalize-space(@name)"/>') " + conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>") );
+			throw UniSetTypes::SystemError( myname + ": Not found Message::NodeID for (node='node_<xsl:value-of select="normalize-space(@name)"/>') " + conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>") );
 	}
 	
 	if( node_<xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
-		throw Exception( myname + ": Not found Message::NodeID for (node='node_<xsl:value-of select="normalize-space(@name)"/>') " + conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>") );
+		throw UniSetTypes::SystemError( myname + ": Not found Message::NodeID for (node='node_<xsl:value-of select="normalize-space(@name)"/>') " + conf->getProp(cnode,"node_<xsl:value-of select="normalize-space(@name)"/>") );
 </xsl:for-each>
 
 	UniXML::iterator it(cnode);
@@ -1025,7 +1025,7 @@ end_private(false)
 		{
 			ostringstream err;
 			err &lt;&lt; myname &lt;&lt; ": не найден идентификатор для датчика 'HeartBeat' " &lt;&lt; heart;
-			throw SystemError(err.str());
+			throw UniSetTypes::SystemError(err.str());
 		}
 
 		int heartbeatTime = conf->getArgPInt("--" + argprefix + "heartbeat-time",it.getProp("heartbeatTime"),conf-&gt;getHeartBeatTime());
@@ -1401,7 +1401,7 @@ askPause(2000),
 forceOut(false)
 {
 	mycrit &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
-	throw Exception( string(myname+": init failed!!!") );
+	throw UniSetTypes::SystemError( string(myname+": init failed!!!") );
 }
 // -----------------------------------------------------------------------------
 <xsl:value-of select="$CLASSNAME"/>_SK::<xsl:value-of select="$CLASSNAME"/>_SK( ObjectId id, xmlNode* cnode, const string&amp; _argprefix ):
@@ -1441,7 +1441,7 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
 	{
 		ostringstream err;
 		err &lt;&lt; "(<xsl:value-of select="$CLASSNAME"/>::init): Unknown ObjectID!";
-		throw SystemError( err.str() );
+		throw UniSetTypes::SystemError( err.str() );
 	}
 
 	mylog = make_shared&lt;DebugStream&gt;();
@@ -1486,7 +1486,7 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
 		{
 			ostringstream err;
 			err &lt;&lt; myname &lt;&lt; ": не найден идентификатор для датчика 'HeartBeat' " &lt;&lt; heart;
-			throw SystemError(err.str());
+			throw UniSetTypes::SystemError(err.str());
 		}
 
 		int heartbeatTime = conf->getArgPInt("--" + argprefix + "heartbeat-time",it.getProp("heartbeatTime"),conf-&gt;getHeartBeatTime());

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

@@ -75,7 +75,7 @@ int main( int argc,char* argv[] )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(main): " << ex << endl;
 	}

Utilities/codegen/ctl-cpp-main.xsl

@@ -82,7 +82,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex)
+	catch( const UniSetTypes::Exception& ex)
 	{
 		cerr << "(main): " << ex << endl;
 	}

extensions/DBServer-MySQL/DBServer_MySQL.cc

@@ -115,7 +115,7 @@ void DBServer_MySQL::confirmInfo( const UniSetTypes::ConfirmMessage* cem )
 			dbcrit << myname << "(update_confirm):  db error: " << db->error() << endl;
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dbcrit << myname << "(update_confirm): " << ex << endl;
 	}
@@ -230,7 +230,7 @@ void DBServer_MySQL::sensorInfo( const UniSetTypes::SensorMessage* si )
 			dbcrit << myname << "(insert) sensor msg error: " << db->error() << endl;
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dbcrit << myname << "(insert_main_history): " << ex << endl;
 	}

extensions/DBServer-MySQL/test.cc

@@ -48,7 +48,7 @@ int main(int argc, char** argv)
 
 		db.close();
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(test): " << ex << endl;
 	}

extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc

@@ -129,7 +129,7 @@ void DBServer_PostgreSQL::confirmInfo( const UniSetTypes::ConfirmMessage* cem )
 			dbcrit << myname << "(update_confirm):  db error: " << db->error() << endl;
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dbcrit << myname << "(update_confirm): " << ex << endl;
 	}
@@ -222,7 +222,7 @@ void DBServer_PostgreSQL::flushInsertBuffer()
 		ibuf.erase(beg, end);
 
 		// ibufSize - беззнаковое, так что надо аккуратно
-		ibufSize = (delnum < ibufSize) ? (ibufSize-delnum) : 0;
+		ibufSize = (delnum < ibufSize) ? (ibufSize - delnum) : 0;
 
 		dbwarn << myname << "(flushInsertBuffer): overflow: clear data " << delnum << " records." << endl;
 		return;
@@ -275,7 +275,7 @@ void DBServer_PostgreSQL::sensorInfo( const UniSetTypes::SensorMessage* si )
 		if( ibufSize >= ibufMaxSize )
 			flushInsertBuffer();
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dbcrit << myname << "(insert_main_history): " << ex << endl;
 	}

extensions/DBServer-PostgreSQL/main.cc

@@ -26,7 +26,7 @@ int main(int argc, char** argv)
 		act->add(dbs);
 		act->run(false);
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(DBServer_PosgreSQL::main): " << ex << endl;
 	}

extensions/DBServer-PostgreSQL/test.cc

@@ -101,7 +101,7 @@ int main(int argc, char** argv)
 
 		db.close();
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(test): " << ex << endl;
 	}

extensions/DBServer-SQLite/DBServer_SQLite.cc

@@ -112,7 +112,7 @@ void DBServer_SQLite::confirmInfo( const UniSetTypes::ConfirmMessage* cem )
 			dbcrit << myname << "(update_confirm):  db error: " << db->error() << endl;
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dbcrit << myname << "(update_confirm): " << ex << endl;
 	}
@@ -213,7 +213,7 @@ void DBServer_SQLite::sensorInfo( const UniSetTypes::SensorMessage* si )
 			dbcrit << myname <<  "(insert) sensor msg error: " << db->error() << endl;
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dbcrit << myname << "(insert_main_history): " << ex << endl;
 	}

extensions/IOControl/IOControl.cc

@@ -435,7 +435,7 @@ void IOControl::execute()
 				ptHeartBeat.reset();
 			}
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			iolog3 << myname << "(execute): " << ex << endl;
 		}
@@ -690,7 +690,7 @@ void IOControl::ioread( IOInfo* it )
 	{
 		iolog3 << myname << "(iopoll): (BadRange)..." << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		iolog3 << myname << "(iopoll): " << ex << endl;
 	}
@@ -938,7 +938,7 @@ void IOControl::initOutputs()
 			else if( it.stype == UniversalIO::AO )
 				card->setAnalogChannel(it.subdev, it.channel, it.defval, it.range, it.aref);
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			iolog3 << myname << "(initOutput): " << ex << endl;
 		}
@@ -979,7 +979,7 @@ void IOControl::initIOCard()
 				card->configureChannel(it.subdev, it.channel, ComediInterface::AO);
 
 		}
-		catch( const Exception& ex)
+		catch( const UniSetTypes::Exception& ex)
 		{
 			iocrit << myname << "(initIOCard): sid=" << it.si.id << " " << ex << endl;
 		}
@@ -1005,7 +1005,7 @@ void IOControl::blink( BlinkList& lst, bool& bstate )
 		{
 			card->setDigitalChannel(io->subdev, io->channel, bstate);
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			iocrit << myname << "(blink): " << ex << endl;
 		}
@@ -1091,7 +1091,7 @@ void IOControl::check_testmode()
 						card->setAnalogChannel(it.subdev, it.channel, it.safety, it.range, it.aref);
 					}
 				}
-				catch( const Exception& ex )
+				catch( const UniSetTypes::Exception& ex )
 				{
 					iolog3 << myname << "(sigterm): " << ex << endl;
 				}
@@ -1100,7 +1100,7 @@ void IOControl::check_testmode()
 		}
 
 	}
-	catch( const Exception& ex)
+	catch( const UniSetTypes::Exception& ex)
 	{
 		iocrit << myname << "(check_testmode): " << ex << endl;
 	}
@@ -1165,7 +1165,7 @@ void IOControl::check_testlamp()
 			}
 		}
 	}
-	catch( const Exception& ex)
+	catch( const UniSetTypes::Exception& ex)
 	{
 		iocrit << myname << "(check_testlamp): " << ex << endl;
 	}
@@ -1369,7 +1369,7 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
 		if( testLamp_s != DefaultObjectId )
 			shm->askSensor(testLamp_s, cmd);
 	}
-	catch( const Exception& ex)
+	catch( const UniSetTypes::Exception& ex)
 	{
 		iocrit << myname << "(askSensors): " << ex << endl;
 	}
@@ -1379,7 +1379,7 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
 		if( testMode_as != DefaultObjectId )
 			shm->askSensor(testMode_as, cmd);
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		iocrit << myname << "(askSensors): " << ex << endl;
 	}
@@ -1400,7 +1400,7 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
 			{
 				shm->askSensor(it.si.id, cmd, myid);
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				iocrit << myname << "(askSensors): " << ex << endl;
 			}
@@ -1682,7 +1682,7 @@ void IOControl::buildCardsList()
 			cards[cardnum] = new ComediInterface(iodev);
 			noCards = false;
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			iocrit << myname << "(buildCardsList): " << ex << endl;
 			throw;

extensions/LogicProcessor/LProcessor.cc

@@ -74,7 +74,7 @@ void LProcessor::execute( const std::string& lfile )
 		{
 			dcrit << logname << "(execute): " << ex << endl;
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dcrit << logname << "(execute): " << ex << endl;
 		}
@@ -192,7 +192,7 @@ void LProcessor::setOuts()
 		{
 			ui.setValue(it.sid, it.el->getOut(), DefaultObjectId);
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dcrit << "(LProcessor::setOuts): " << ex << endl;
 		}

extensions/LogicProcessor/PassiveLProcessor.cc

@@ -88,7 +88,7 @@ void PassiveLProcessor::step()
 	{
 		LProcessor::step();
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << myname << "(step): (hb) " << ex << std::endl;
 	}
@@ -100,7 +100,7 @@ void PassiveLProcessor::step()
 			shm->localSetValue(itHeartBeat, sidHeartBeat, maxHeartBeat, getId());
 			ptHeartBeat.reset();
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dcrit << myname << "(step): (hb) " << ex << std::endl;
 		}
@@ -120,7 +120,7 @@ void PassiveLProcessor::askSensors( UniversalIO::UIOCommand cmd )
 		for( auto& it : extInputs )
 			shm->askSensor(it.sid, cmd);
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << myname << "(askSensors): " << ex << endl;
 		throw SystemError(myname + "(askSensors): do not ask sensors" );
@@ -236,7 +236,7 @@ void PassiveLProcessor::setOuts()
 		{
 			shm->setValue( it.sid, it.el->getOut() );
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dcrit << myname << "(setOuts): " << ex << endl;
 		}
@@ -255,7 +255,7 @@ void PassiveLProcessor::sigterm( int signo )
 		{
 			shm->setValue(it.sid, 0);
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dcrit << myname << "(sigterm): " << ex << endl;
 		}

extensions/LogicProcessor/logicproc.cc

@@ -58,7 +58,7 @@ int main(int argc, const char** argv)
 	{
 		cerr << ex << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << ex << endl;
 	}

extensions/LogicProcessor/plogicproc.cc

@@ -95,7 +95,7 @@ int main(int argc, const char** argv)
 	{
 		cerr << ex << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << ex << endl;
 	}

extensions/LogicProcessor/tests/tests.cc

@@ -66,7 +66,7 @@ int main(int argc, const char* argv[] )
 	{
 		cerr << "(tests): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests): " << ex << endl;
 	}

extensions/ModbusMaster/MBExchange.cc

@@ -319,7 +319,7 @@ void MBExchange::step()
 			shm->localSetValue(itHeartBeat, sidHeartBeat, maxHeartBeat, getId());
 			ptHeartBeat.reset();
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			mbcrit << myname << "(step): (hb) " << ex << std::endl;
 		}
@@ -928,7 +928,7 @@ bool MBExchange::initSMValue( ModbusRTU::ModbusData* data, int count, RSProperty
 	{
 		mblog3 << myname << "(initSMValue): (BadRange)..." << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		mblog3 << myname << "(initSMValue): " << ex << endl;
 	}
@@ -1188,7 +1188,7 @@ void MBExchange::updateSM()
 			{
 				mblog3 << myname << "(updateSM): (BadRange)..." << endl;
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mblog3 << myname << "(updateSM): " << ex << endl;
 			}
@@ -1236,7 +1236,7 @@ void MBExchange::updateSM()
 				{
 					mblog3 << myname << "(updateSM): (BadRange)..." << endl;
 				}
-				catch( const Exception& ex )
+				catch( const UniSetTypes::Exception& ex )
 				{
 					mblog3 << myname << "(updateSM): " << ex << endl;
 				}
@@ -1651,7 +1651,7 @@ void MBExchange::updateRSProperty( RSProperty* p, bool write_only )
 	{
 		mblog3 << myname << "(updateRSProperty): (BadRange)..." << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		mblog3 << myname << "(updateRSProperty): " << ex << endl;
 	}
@@ -1911,7 +1911,7 @@ void MBExchange::updateMTR( RegMap::iterator& rit )
 			{
 				mblog3 << myname << "(updateMTR): (BadRange)..." << endl;
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mblog3 << myname << "(updateMTR): " << ex << endl;
 			}
@@ -2002,7 +2002,7 @@ void MBExchange::updateRTU188( RegMap::iterator& rit )
 		{
 			mblog3 << myname << "(updateRTU188): (BadRange)..." << endl;
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			mblog3 << myname << "(updateRTU188): " << ex << endl;
 		}
@@ -3223,7 +3223,7 @@ void MBExchange::updateRespondSensors()
 
 				shm->localSetValue(d->resp_it, d->resp_id, ( set ? 1 : 0 ), getId());
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mbcrit << myname << "(step): (respond) " << ex << std::endl;
 			}
@@ -3251,7 +3251,7 @@ void MBExchange::execute()
 		{
 			step();
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			mbcrit << myname << "(execute): " << ex << std::endl;
 		}

extensions/ModbusMaster/MBTCPMultiMaster.cc

@@ -124,6 +124,7 @@ MBTCPMultiMaster::MBTCPMultiMaster( UniSetTypes::ObjectId objId, UniSetTypes::Ob
 		sinf->respond_force = it1.getPIntProp("force", 0);
 
 		int fn = conf->getArgPInt("--" + prefix + "-check-func", it.getProp("checkFunc"), ModbusRTU::fnUnknown);
+
 		if( fn != ModbusRTU::fnUnknown &&
 				fn != ModbusRTU::fnReadCoilStatus &&
 				fn != ModbusRTU::fnReadInputStatus &&
@@ -248,7 +249,7 @@ std::shared_ptr<ModbusClient> MBTCPMultiMaster::initMB( bool reopen )
 	{
 		// сперва надо обновить все ignore
 		// т.к. фактически флаги выставляются и сбрасываются только здесь
-		for( auto&& it: mblist )
+		for( auto && it : mblist )
 			it->ignore = !it->ptIgnoreTimeout.checkTime();
 
 		// если reopen=true - значит почему-то по текущему каналу связи нет (хотя соединение есть)
@@ -289,6 +290,7 @@ std::shared_ptr<ModbusClient> MBTCPMultiMaster::initMB( bool reopen )
 	for( auto it = mblist.rbegin(); it != mblist.rend(); ++it )
 	{
 		auto m = (*it);
+
 		if( m->respond && !m->ignore && m->init(mblog) )
 		{
 			mbi = it;
@@ -306,6 +308,7 @@ std::shared_ptr<ModbusClient> MBTCPMultiMaster::initMB( bool reopen )
 	for( auto it = mblist.rbegin(); it != mblist.rend(); ++it )
 	{
 		auto& m = (*it);
+
 		if( m->respond && m->check() && m->init(mblog) )
 		{
 			mbi = it;
@@ -348,41 +351,42 @@ bool MBTCPMultiMaster::MBSlaveInfo::check()
 	if( use )
 		return true;
 
-//	cerr << myname << "(check): check connection..." << ip << ":" << port
-//		 << " mbfunc=" << checkFunc
-//		 << " mbaddr=" << ModbusRTU::addr2str(checkAddr)
-//		 << " mbreg=" << (int)checkReg << "(" << ModbusRTU::dat2str(checkReg) << ")"
-//		 << endl;
+	//	cerr << myname << "(check): check connection..." << ip << ":" << port
+	//		 << " mbfunc=" << checkFunc
+	//		 << " mbaddr=" << ModbusRTU::addr2str(checkAddr)
+	//		 << " mbreg=" << (int)checkReg << "(" << ModbusRTU::dat2str(checkReg) << ")"
+	//		 << endl;
 
 	try
 	{
-		mbtcp->connect(ip,port,false);
+		mbtcp->connect(ip, port, false);
+
 		switch(checkFunc)
 		{
 			case ModbusRTU::fnReadCoilStatus:
 			{
-				auto ret = mbtcp->read01(checkAddr,checkReg,1);
+				auto ret = mbtcp->read01(checkAddr, checkReg, 1);
 				return true;
 			}
 			break;
 
 			case ModbusRTU::fnReadInputStatus:
 			{
-				auto ret = mbtcp->read02(checkAddr,checkReg,1);
+				auto ret = mbtcp->read02(checkAddr, checkReg, 1);
 				return true;
 			}
 			break;
 
 			case ModbusRTU::fnReadOutputRegisters:
 			{
-				auto ret = mbtcp->read03(checkAddr,checkReg,1);
+				auto ret = mbtcp->read03(checkAddr, checkReg, 1);
 				return true;
 			}
 			break;
 
 			case ModbusRTU::fnReadInputRegisters:
 			{
-				auto ret = mbtcp->read04(checkAddr,checkReg,1);
+				auto ret = mbtcp->read04(checkAddr, checkReg, 1);
 				return true;
 			}
 			break;
@@ -391,7 +395,7 @@ bool MBTCPMultiMaster::MBSlaveInfo::check()
 				return mbtcp->checkConnection(ip, port, recv_timeout);
 		}
 	}
-	catch(...){}
+	catch(...) {}
 
 	return false;
 }
@@ -482,7 +486,7 @@ void MBTCPMultiMaster::check_thread()
 {
 	while( checkProcActive() )
 	{
-		for( auto&& it: mblist )
+		for( auto && it : mblist )
 		{
 			try
 			{
@@ -516,7 +520,7 @@ void MBTCPMultiMaster::check_thread()
 						it->respond_init = true;
 					}
 				}
-				catch( const Exception& ex )
+				catch( const UniSetTypes::Exception& ex )
 				{
 					mbcrit << myname << "(check): (respond) " << it->myname << " : " << ex << std::endl;
 				}
@@ -613,6 +617,7 @@ void MBTCPMultiMaster::initCheckConnectionParameters()
 	auto conf = uniset_conf();
 
 	bool initFromRegMap = ( findArgParam("--" + prefix + "-check-init-from-regmap", conf->getArgc(), conf->getArgv()) != -1 );
+
 	if( !initFromRegMap )
 		return;
 
@@ -635,16 +640,17 @@ void MBTCPMultiMaster::initCheckConnectionParameters()
 	}
 
 	// идём по устройствам
-	for( const auto& d: devices )
+	for( const auto& d : devices )
 	{
 		checkAddr = d.second->mbaddr;
+
 		if( d.second->pollmap.empty() )
 			continue;
 
 		// идём по списку опрашиваемых регистров
 		for( auto p = d.second->pollmap.begin(); p != d.second->pollmap.end(); ++p )
 		{
-			for( auto r = p->second->begin(); r!=p->second->end(); ++r )
+			for( auto r = p->second->begin(); r != p->second->end(); ++r )
 			{
 				if( ModbusRTU::isReadFunction(r->second->mbfunc) )
 				{
@@ -681,7 +687,7 @@ void MBTCPMultiMaster::initCheckConnectionParameters()
 		   << endl;
 
 	// инициализируем..
-	for( auto&& m: mblist )
+	for( auto && m : mblist )
 	{
 		m->checkFunc = checkFunc;
 		m->checkAddr = checkAddr;

extensions/ModbusMaster/RTUExchange.cc

@@ -160,7 +160,7 @@ std::shared_ptr<ModbusClient> RTUExchange::initMB( bool reopen )
 
 		mbinfo << myname << "(init): dev=" << devname << " speed=" << ComPort::getSpeed( mbrtu->getSpeed() ) << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		//if( mbrtu )
 		//    delete mbrtu;

extensions/ModbusMaster/main.cc

@@ -61,7 +61,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(mbtcpmaster): " << ex << std::endl;
 	}

extensions/ModbusMaster/mb-perf-test.cc

@@ -81,7 +81,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(mbtcpmultimaster): " << ex << std::endl;
 	}

extensions/ModbusMaster/multi-main.cc

@@ -76,7 +76,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(mbtcpmultimaster): " << ex << std::endl;
 	}

extensions/ModbusMaster/rtuexchange.cc

@@ -76,7 +76,7 @@ int main( int argc, char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(rtuexchange): " << ex << std::endl;
 	}

extensions/ModbusMaster/tests/run_test_mbtcpmaster.cc

@@ -74,7 +74,7 @@ int main( int argc, const char* argv[] )
 
 		return session.run();
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_mbtcpmaster): " << ex << endl;
 	}

extensions/ModbusMaster/tests/run_test_mbtcpmultimaster.cc

@@ -74,7 +74,7 @@ int main(int argc, const char* argv[] )
 	{
 		cerr << "(tests_mbtcpmultimaster): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_mbtcpmultimaster): " << ex << endl;
 	}

extensions/ModbusMaster/tests/test_mbtcpmaster.cc

@@ -96,7 +96,7 @@ TEST_CASE("MBTCPMaster: reconnect", "[modbus][mbmaster][mbtcpmaster]")
 	REQUIRE_FALSE(mb.isConnection());
 
 	// нормальное подключение
-	REQUIRE(mb.connect(iaddr,port));
+	REQUIRE(mb.connect(iaddr, port));
 	REQUIRE(mb.isConnection());
 
 	// переподключение (при активном текущем)
@@ -116,7 +116,7 @@ TEST_CASE("MBTCPMaster: reconnect", "[modbus][mbmaster][mbtcpmaster]")
 	REQUIRE_FALSE(mb.isConnection());
 
 	// нормальное подключение
-	REQUIRE(mb.connect(iaddr,port));
+	REQUIRE(mb.connect(iaddr, port));
 	REQUIRE(mb.isConnection());
 
 	// принудительное отключение
@@ -130,15 +130,17 @@ TEST_CASE("MBTCPMaster: forceDisconnect", "[modbus][mbmaster][mbtcpmaster][force
 	ModbusTCPMaster mb;
 	mb.setTimeout(500);
 
-	for( size_t i=0; i<1000; i++ )
+	for( size_t i = 0; i < 1000; i++ )
 	{
 		// подключение к несуществующему адресу
 		REQUIRE_FALSE(mb.connect(iaddr, 2048));
+
 		try
 		{
-			mb.read03(slaveADDR,10,1);
+			mb.read03(slaveADDR, 10, 1);
 		}
-		catch(...){}
+		catch(...) {}
+
 		REQUIRE_FALSE(mb.isConnection());
 		mb.forceDisconnect();
 	}
@@ -151,15 +153,17 @@ TEST_CASE("MBTCPMaster: disconnect", "[modbus][mbmaster][mbtcpmaster][disconnect
 	mb.setTimeout(500);
 	mb.setForceDisconnect(true);
 
-	for( size_t i=0; i<1000; i++ )
+	for( size_t i = 0; i < 1000; i++ )
 	{
 		// подключение к несуществующему адресу
 		REQUIRE_FALSE(mb.connect(iaddr, 2048));
+
 		try
 		{
-			mb.read03(slaveADDR,10,1);
+			mb.read03(slaveADDR, 10, 1);
 		}
-		catch(...){}
+		catch(...) {}
+
 		REQUIRE_FALSE(mb.isConnection());
 		mb.disconnect();
 	}

extensions/ModbusSlave/MBSlave.cc

@@ -683,7 +683,7 @@ void MBSlave::updateStatistics()
 				shm->localSetValue(itHeartBeat, sidHeartBeat, maxHeartBeat, getId());
 				ptHeartBeat.reset();
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mbcrit << myname << "(updateStatistics): (hb) " << ex << std::endl;
 			}
@@ -700,7 +700,7 @@ void MBSlave::updateStatistics()
 			{
 				shm->localSetValue(itRespond, respond_id, (state ? 1 : 0), getId());
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mbcrit << myname << "(updateStatistics): (respond) " << ex << std::endl;
 			}
@@ -712,7 +712,7 @@ void MBSlave::updateStatistics()
 			{
 				shm->localSetValue(itAskCount, askcount_id, askCount, getId());
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mbcrit << myname << "(updateStatistics): (askCount) " << ex << std::endl;
 			}
@@ -724,7 +724,7 @@ void MBSlave::updateStatistics()
 			{
 				shm->localSetValue(sesscount_it, sesscount_id, tcpserver->getCountSessions(), getId());
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				mbcrit << myname << "(updateStatistics): (sessCount) " << ex << std::endl;
 			}
@@ -797,7 +797,7 @@ void MBSlave::updateTCPStatistics()
 					bool st = c.invert ? c.ptTimeout.checkTime() : !c.ptTimeout.checkTime();
 					shm->localSetValue(c.respond_it, c.respond_s, st, getId());
 				}
-				catch( const Exception& ex )
+				catch( const UniSetTypes::Exception& ex )
 				{
 					mbcrit << myname << "(updateStatistics): " << ex << std::endl;
 				}
@@ -809,7 +809,7 @@ void MBSlave::updateTCPStatistics()
 				{
 					shm->localSetValue(c.askcount_it, c.askcount_s, c.askCount, getId());
 				}
-				catch( const Exception& ex )
+				catch( const UniSetTypes::Exception& ex )
 				{
 					mbcrit << myname << "(updateStatistics): " << ex << std::endl;
 				}
@@ -1961,7 +1961,7 @@ ModbusRTU::mbErrCode MBSlave::real_write_prop( IOProperty* p, ModbusRTU::ModbusD
 		mbwarn << myname << "(real_write_prop): " << ex << endl;
 		return ModbusRTU::erBadDataValue;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( pingOK )
 			mbcrit << myname << "(real_write_prop): " << ex << endl;
@@ -2214,7 +2214,7 @@ ModbusRTU::mbErrCode MBSlave::real_read_prop( IOProperty* p, ModbusRTU::ModbusDa
 		mbwarn << myname << "(real_read_prop): " << ex << endl;
 		return ModbusRTU::erBadDataValue;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( pingOK )
 			mbcrit << myname << "(real_read_prop): " << ex << endl;
@@ -2354,7 +2354,7 @@ ModbusRTU::mbErrCode MBSlave::readCoilStatus( ReadCoilMessage& query,
 		mbwarn << myname << "(readCoilStatus): " << ex << endl;
 		return ModbusRTU::erBadDataAddress;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( pingOK )
 			mbcrit << myname << "(readCoilStatus): " << ex << endl;
@@ -2427,7 +2427,7 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
 		mbwarn << myname << "(readInputStatus): " << ex << endl;
 		return ModbusRTU::erBadDataAddress;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( pingOK )
 			mbcrit << myname << "(readInputStatus): " << ex << endl;

extensions/ModbusSlave/mbslave.cc

@@ -84,7 +84,7 @@ int main(int argc, const char** argv)
 	{
 		dcrit << "(mbslave): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(mbslave): " << ex << endl;
 	}

extensions/ModbusSlave/mbtcp-persistentslave.cc

@@ -95,7 +95,7 @@ int main(int argc, const char** argv)
 	{
 		dcrit << "(mbmultislave): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(mbmultislave): " << ex << endl;
 	}

extensions/ModbusSlave/tests/tests_with_sm.cc

@@ -80,7 +80,7 @@ int main(int argc, const char* argv[] )
 	{
 		cerr << "(tests_with_sm): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_with_sm): " << ex << endl;
 	}

extensions/RRDServer/RRDServer.cc

@@ -59,6 +59,7 @@ RRDServer::RRDServer(UniSetTypes::ObjectId objId, xmlNode* cnode, UniSetTypes::O
 	{
 		// берём первый датчик из списка
 		const auto& lst = rrdlist.begin()->dslist;
+
 		if( !lst.empty() )
 		{
 			const auto& dsi = *(lst.begin());
@@ -280,7 +281,7 @@ void RRDServer::help_print( int argc, const char* const* argv )
 	cout << "             logfile filanme " << endl;
 	cout << "             no-debug " << endl;
 	cout << " Base oprtions: " << endl;
-//	cout << UObject_SK::help() << endl;
+	//	cout << UObject_SK::help() << endl;
 	cout << " LogServer: " << endl;
 	cout << "--prefix-run-logserver      - run logserver. Default: localhost:id" << endl;
 	cout << "--prefix-logserver-host ip  - listen ip. Default: localhost" << endl;

extensions/SMDBServer/SMDBServer.cc

@@ -127,7 +127,7 @@ void SMDBServer::step()
 			shm->localSaveValue(aitHeartBeat, sidHeartBeat, maxHeartBeat, getId());
 			ptHeartBeat.reset();
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dcrit << myname << "(step): (hb) " << ex << std::endl;
 		}
@@ -183,7 +183,7 @@ void SMDBServer::initDB( DBInterface* db )
 			}
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << myname << "(filling ObjectsMap): " << ex << std::endl;
 	}

extensions/SMDBServer/main.cc

@@ -71,7 +71,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(smdbserver): " << ex << std::endl;
 	}

extensions/SMViewer/main.cc

@@ -38,7 +38,7 @@ int main( int argc, const char** argv )
 		smv.run();
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cout << "(main):" << ex << endl;
 	}

extensions/SharedMemory/SharedMemory.cc

@@ -398,7 +398,7 @@ void SharedMemory::checkHeartBeat()
 				}
 			}
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			smcrit << myname << "(checkHeartBeat): " << ex << endl;
 		}
@@ -973,7 +973,7 @@ bool SharedMemory::initFromSM( UniSetTypes::ObjectId sm_id, UniSetTypes::ObjectI
 
 #endif
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				smcrit << myname << "(initFromSM): " << ex << endl;
 			}

extensions/SharedMemory/smemory.cc

@@ -56,7 +56,7 @@ int main(int argc, const char** argv)
 	{
 		dcrit << "(smemory): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(smemory): " << ex << endl;
 	}

extensions/SharedMemory/tests/tests.cc

@@ -97,7 +97,7 @@ int main(int argc, const char* argv[] )
 	{
 		cerr << "(tests): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests): " << ex << endl;
 	}

extensions/SharedMemoryPlus/smemory-plus.cc

@@ -224,7 +224,7 @@ int main( int argc, const char** argv )
 		on_sigchild(SIGTERM);
 		return 0;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(smemory-plus): " << ex << endl;
 	}

extensions/UNetUDP/UNetExchange.cc

@@ -85,7 +85,7 @@ UNetExchange::UNetExchange(UniSetTypes::ObjectId objId, UniSetTypes::ObjectId sh
 	int maxProcessingCount = conf->getArgPInt("--" + prefix + "-maxprocessingcount", it.getProp("maxProcessingCount"), 100);
 	int checkConnectionPause = conf->getArgPInt("--" + prefix + "-checkconnection-pause", it.getProp("checkConnectionPause"), 10000);
 
-	std::string updateStrategy = conf->getArg2Param("--" + prefix + "-update-strategy", it.getProp("updateStartegy"),"evloop");
+	std::string updateStrategy = conf->getArg2Param("--" + prefix + "-update-strategy", it.getProp("updateStartegy"), "evloop");
 
 	no_sender = conf->getArgInt("--" + prefix + "-nosender", it.getProp("nosender"));
 
@@ -312,11 +312,12 @@ UNetExchange::UNetExchange(UniSetTypes::ObjectId objId, UniSetTypes::ObjectId sh
 			}
 		}
 
-		UNetReceiver::UpdateStrategy r_upStrategy = UNetReceiver::strToUpdateStrategy( n_it.getProp2("unet_update_strategy",updateStrategy) );
+		UNetReceiver::UpdateStrategy r_upStrategy = UNetReceiver::strToUpdateStrategy( n_it.getProp2("unet_update_strategy", updateStrategy) );
+
 		if( r_upStrategy == UNetReceiver::useUpdateUnknown )
 		{
 			ostringstream err;
-			err << myname << ": Unknown update strategy!!! '" << n_it.getProp2("unet_update_startegy",updateStrategy) << "'" << endl;
+			err << myname << ": Unknown update strategy!!! '" << n_it.getProp2("unet_update_startegy", updateStrategy) << "'" << endl;
 			unetcrit << myname << "(init): " << err.str() << endl;
 			throw SystemError(err.str());
 		}

extensions/UNetUDP/UNetReceiver.cc

@@ -126,7 +126,7 @@ void UNetReceiver::setUpdatePause( timeout_t msec ) noexcept
 	updatepause = msec;
 
 	if( upStrategy == useUpdateEventLoop && evUpdate.is_active() )
-		evUpdate.start(0, (float)updatepause/1000.);
+		evUpdate.start(0, (float)updatepause / 1000.);
 }
 // -----------------------------------------------------------------------------
 void UNetReceiver::setMaxProcessingCount( int set ) noexcept
@@ -178,6 +178,7 @@ bool UNetReceiver::createConnection( bool throwEx )
 		udp = make_shared<UDPReceiveU>(addr, port);
 		udp->setBlocking(false); // делаем неблокирующее чтение (нужно для libev)
 		evReceive.set<UNetReceiver, &UNetReceiver::callback>(this);
+
 		if( upStrategy == useUpdateEventLoop )
 			evUpdate.set<UNetReceiver, &UNetReceiver::updateEvent>(this);
 
@@ -241,7 +242,7 @@ void UNetReceiver::evprepare( const ev::loop_ref& eloop ) noexcept
 	{
 		evUpdate.set(eloop);
 		evUpdate.start();
-		evUpdate.start( 0, ((float)updatepause/1000.) );
+		evUpdate.start( 0, ((float)updatepause / 1000.) );
 	}
 
 	if( !udp )
@@ -282,7 +283,7 @@ void UNetReceiver::evfinish( const ev::loop_ref& eloop ) noexcept
 // -----------------------------------------------------------------------------
 void UNetReceiver::forceUpdate() noexcept
 {
-	pack_guard l(packMutex,upStrategy);
+	pack_guard l(packMutex, upStrategy);
 	pnum = 0; // сбрасываем запомненый номер последнего обработанного пакета
 	// и тем самым заставляем обновить данные в SM (см. update)
 }
@@ -298,10 +299,10 @@ void UNetReceiver::statisticsEvent(ev::periodic& tm, int revents) noexcept
 	statRecvPerSec = recvCount;
 	statUpPerSec = upCount;
 
-//	unetlog9 << myname << "(statisctics):"
-//			 << " recvCount=" << recvCount << "[per sec]"
-//			 << " upCount=" << upCount << "[per sec]"
-//			 << endl;
+	//	unetlog9 << myname << "(statisctics):"
+	//			 << " recvCount=" << recvCount << "[per sec]"
+	//			 << " upCount=" << upCount << "[per sec]"
+	//			 << endl;
 
 	recvCount = 0;
 	upCount = 0;
@@ -321,7 +322,7 @@ void UNetReceiver::update() noexcept
 	{
 		{
 			// lock qpack
-			pack_guard l(packMutex,upStrategy);
+			pack_guard l(packMutex, upStrategy);
 
 			if( qpack.empty() )
 				return;
@@ -720,7 +721,7 @@ bool UNetReceiver::receive() noexcept
 
 	{
 		// lock qpack
-		pack_guard l(packMutex,upStrategy);
+		pack_guard l(packMutex, upStrategy);
 
 		if( !waitClean )
 		{
@@ -878,6 +879,7 @@ string UNetReceiver::to_string( UNetReceiver::UpdateStrategy s ) noexcept
 {
 	if( s == useUpdateThread )
 		return "thread";
+
 	if( s == useUpdateEventLoop )
 		return "evloop";
 

extensions/UNetUDP/UNetReceiver.h

@@ -323,7 +323,7 @@ class UNetReceiver:
 		struct CacheInfo
 		{
 			CacheInfo():
-				cache_init_ok(false){}
+				cache_init_ok(false) {}
 
 			bool cache_init_ok = { false };
 			CacheVec cache;

extensions/UNetUDP/UNetSender.cc

@@ -146,7 +146,7 @@ bool UNetSender::createConnection( bool throwEx )
 // -----------------------------------------------------------------------------
 void UNetSender::updateFromSM()
 {
-	for( auto&& it: items )
+	for( auto && it : items )
 	{
 		UItem& i = it.second;
 		long value = shm->localGetValue(i.ioit, i.id);
@@ -160,6 +160,7 @@ void UNetSender::updateSensor( UniSetTypes::ObjectId id, long value )
 		return;
 
 	auto it = items.find(id);
+
 	if( it != items.end() )
 		updateItem( it->second, value );
 }
@@ -170,6 +171,7 @@ void UNetSender::updateItem( UItem& it, long value )
 
 	auto& mypack(pk[it.pack_num]);
 	UniSetTypes::uniset_rwmutex_wrlock l(mypack.mut);
+
 	if( it.iotype == UniversalIO::DI || it.iotype == UniversalIO::DO )
 		mypack.msg.setDData(it.pack_ind, value);
 	else if( it.iotype == UniversalIO::AI || it.iotype == UniversalIO::AO )
@@ -280,6 +282,7 @@ void UNetSender::real_send( PackMessage& mypack ) noexcept
 			mypack.msg.num = packetnum++;
 			lastcrc = crc;
 		}
+
 #endif
 
 		// при переходе через ноль (когда счётчик перевалит через UniSetUDP::MaxPacketNum..
@@ -482,6 +485,7 @@ bool UNetSender::initItem( UniXML::iterator& it )
 
 	unetinfo << myname << "(initItem): add " << p << endl;
 	auto i = items.find(p.id);
+
 	if( i != items.end() )
 	{
 		unetcrit << myname
@@ -535,8 +539,9 @@ const std::string UNetSender::getShortInfo() const
 	for( auto i = mypacks.begin(); i != mypacks.end(); ++i )
 	{
 		s << "        \t[" << i->first << "]=" << i->second.size() << endl;
-		size_t n=0;
-		for( const auto& p: i->second )
+		size_t n = 0;
+
+		for( const auto& p : i->second )
 		{
 			//uniset_rwmutex_rlock l(p->mut);
 			s << "        \t\t[" << (n++) << "]=" << p.msg.sizeOf() << " bytes"

extensions/UNetUDP/UNetSender.h

@@ -91,7 +91,7 @@ class UNetSender
 			friend std::ostream& operator<<( std::ostream& os, UItem& p );
 		};
 
-		typedef std::unordered_map<UniSetTypes::ObjectId,UItem> UItemMap;
+		typedef std::unordered_map<UniSetTypes::ObjectId, UItem> UItemMap;
 
 		size_t getDataPackCount() const;
 
@@ -102,7 +102,7 @@ class UNetSender
 
 		struct PackMessage
 		{
-			PackMessage( UniSetUDP::UDPMessage&& m ) noexcept:msg(std::move(m)){}
+			PackMessage( UniSetUDP::UDPMessage&& m ) noexcept: msg(std::move(m)) {}
 			PackMessage( const UniSetUDP::UDPMessage& m ) = delete;
 
 			PackMessage() noexcept {}

extensions/UNetUDP/tests/test_unetudp.cc

@@ -187,7 +187,7 @@ TEST_CASE("[UNetUDP]: sizeOf", "[unetudp][sizeof]")
 
 	m.addAData(8, 70);
 
-	REQUIRE( m.sizeOf() == sizeof(UniSetUDP::UDPHeader)+sizeof(UniSetUDP::UDPAData) );
+	REQUIRE( m.sizeOf() == sizeof(UniSetUDP::UDPHeader) + sizeof(UniSetUDP::UDPAData) );
 
 	UniSetUDP::UDPPacket p;
 	size_t len = m.transport_msg(p);

extensions/UNetUDP/tests/tests_individual_process.cc

@@ -69,7 +69,7 @@ int main(int argc, char* argv[] )
 	{
 		cerr << "(tests_with_sm): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_with_sm): " << ex << endl;
 	}

extensions/UNetUDP/tests/tests_with_sm.cc

@@ -74,7 +74,7 @@ int main(int argc, const char* argv[] )
 	{
 		cerr << "(tests_with_sm): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_with_sm): " << ex << endl;
 	}

extensions/UNetUDP/tests/urecv_perf_test.cc

@@ -187,7 +187,7 @@ int main(int argc, char* argv[] )
 	{
 		cerr << "(urecv-perf-test): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(urecv-perf-test): " << ex << endl;
 	}

extensions/UNetUDP/unet-udp-tester.cc

@@ -312,8 +312,9 @@ int main(int argc, char* argv[])
 
 				if( !a_data.empty() )
 				{
-					auto vlist = UniSetTypes::getSInfoList(a_data,nullptr);
-					for( const auto& v: vlist )
+					auto vlist = UniSetTypes::getSInfoList(a_data, nullptr);
+
+					for( const auto& v : vlist )
 					{
 						UDPAData d(v.si.id, v.val);
 						mypack.addAData(d);
@@ -330,9 +331,10 @@ int main(int argc, char* argv[])
 
 				if( !d_data.empty() )
 				{
-					auto vlist = UniSetTypes::getSInfoList(d_data,nullptr);
-					for( const auto& v: vlist )
-						mypack.addDData(v.si.id,v.val);
+					auto vlist = UniSetTypes::getSInfoList(d_data, nullptr);
+
+					for( const auto& v : vlist )
+						mypack.addDData(v.si.id, v.val);
 				}
 				else
 				{

extensions/UNetUDP/unetexchange.cc

@@ -60,7 +60,7 @@ int main( int argc, const char** argv )
 		act->run(false);
 		on_sigchild(SIGTERM);
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		dcrit << "(unetexchange): " << ex << std::endl;
 	}

extensions/UniNetwork/UniExchange.cc

@@ -184,7 +184,7 @@ void UniExchange::execute()
 				dinfo << myname << " update sensors from id=" << it.id << " node=" << it.node << endl;
 				it.update(sseq, shm);
 			}
-			catch( const Exception& ex )
+			catch( const UniSetTypes::Exception& ex )
 			{
 				dwarn << myname << "(execute): " << ex << endl;
 			}
@@ -258,7 +258,7 @@ void UniExchange::NetNodeInfo::update( IOController_i::ShortMapSeq_var& map, con
 			*/
 			shm->localSetValue( s->ioit, m->id, m->value, shm->ID() );
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dwarn  << "(update): " << ex << endl;
 		}
@@ -303,7 +303,7 @@ void UniExchange::updateLocalData()
 			uniset_rwmutex_wrlock lock(it.val_lock);
 			it.val = shm->localGetValue( it.ioit, it.id );
 		}
-		catch( const Exception& ex )
+		catch( const UniSetTypes::Exception& ex )
 		{
 			dwarn  << "(update): " << ex << endl;
 		}

extensions/include/Calibration.h

@@ -77,8 +77,8 @@ class Calibration
 {
 	public:
 		Calibration();
-		Calibration( const std::string& name, const std::string& confile = "calibration.xml", size_t reserv=50 );
-		Calibration( xmlNode* node, size_t reserv=50 );
+		Calibration( const std::string& name, const std::string& confile = "calibration.xml", size_t reserv = 50 );
+		Calibration( xmlNode* node, size_t reserv = 50 );
 		~Calibration();
 
 		/*! Тип для хранения значения */

extensions/include/MTR.h

@@ -244,10 +244,11 @@ namespace MTR
 			// ------------------------------------------
 			// конструкторы на разные случаи...
 			T4(): sval(""), raw(0) {}
-			T4( unsigned short v1 ): raw(v1)
+			T4( uint16_t v1 ): raw(v1)
 			{
-				char c[3];
-				memcpy(c, &v1, sizeof(c));
+				char c[sizeof(v1) + 1];
+				memcpy(c, &v1, sizeof(v1));
+				c[sizeof(v1)] = '\0';
 				sval = std::string(c);
 			}
 
@@ -255,7 +256,8 @@ namespace MTR
 				raw(data[0])
 			{
 				char c[3];
-				memcpy(c, &(data[0]), sizeof(c));
+				memcpy(c, &(data[0]), 2);
+				c[2] = '\0';
 				sval     = std::string(c);
 			}
 

extensions/include/UObject_SK.h

@@ -29,7 +29,7 @@ class UObject_SK:
 	public UniSetObject
 {
 	public:
-		UObject_SK( UniSetTypes::ObjectId id, xmlNode* node=UniSetTypes::uniset_conf()->getNode("UObject"), const std::string& argprefix="" );
+		UObject_SK( UniSetTypes::ObjectId id, xmlNode* node = UniSetTypes::uniset_conf()->getNode("UObject"), const std::string& argprefix = "" );
 		UObject_SK();
 		virtual ~UObject_SK();
 
@@ -43,54 +43,60 @@ class UObject_SK:
 
 		virtual bool setMsg( UniSetTypes::ObjectId code, bool state = true ) noexcept;
 
-		inline std::shared_ptr<DebugStream> log() noexcept { return mylog; }
-		inline std::shared_ptr<LogAgregator> logAgregator() noexcept { return loga; }
+		inline std::shared_ptr<DebugStream> log() noexcept
+		{
+			return mylog;
+		}
+		inline std::shared_ptr<LogAgregator> logAgregator() noexcept
+		{
+			return loga;
+		}
 
 		void init_dlog( std::shared_ptr<DebugStream> d ) noexcept;
 
 		// "синтаксический сахар"..для логов
-        #ifndef myinfo 
-        	#define myinfo if( log()->debugging(Debug::INFO) ) log()->info() 
-        #endif
-        #ifndef mywarn
-	        #define mywarn if( log()->debugging(Debug::WARN) ) log()->warn()
-        #endif
-        #ifndef mycrit
-    	    #define mycrit if( log()->debugging(Debug::CRIT) ) log()->crit()
-        #endif
-        #ifndef mylog1
-        	#define mylog1 if( log()->debugging(Debug::LEVEL1) ) log()->level1()
-        #endif
-        #ifndef mylog2
-	        #define mylog2 if( log()->debugging(Debug::LEVEL2) ) log()->level2()
-        #endif
-        #ifndef mylog3
-    	    #define mylog3 if( log()->debugging(Debug::LEVEL3) ) log()->level3()
-        #endif
-        #ifndef mylog4
-        	#define mylog4 if( log()->debugging(Debug::LEVEL4) ) log()->level4()
-        #endif
-        #ifndef mylog5
-	        #define mylog5 if( log()->debugging(Debug::LEVEL5) ) log()->level5()
-        #endif
-        #ifndef mylog6
-    	    #define mylog6 if( log()->debugging(Debug::LEVEL6) ) log()->level6()
-        #endif
-        #ifndef mylog7
-        	#define mylog7 if( log()->debugging(Debug::LEVEL7) ) log()->level7()
-        #endif
-        #ifndef mylog8
-	        #define mylog8 if( log()->debugging(Debug::LEVEL8) ) log()->level8()
-        #endif
-        #ifndef mylog9
-    	    #define mylog9 if( log()->debugging(Debug::LEVEL9) ) log()->level9()
-        #endif
-        #ifndef mylogany
-        	#define mylogany log()->any()
-        #endif
-        #ifndef vmonit
-            #define vmonit( var ) vmon.add( #var, var )
-        #endif
+#ifndef myinfo
+#define myinfo if( log()->debugging(Debug::INFO) ) log()->info()
+#endif
+#ifndef mywarn
+#define mywarn if( log()->debugging(Debug::WARN) ) log()->warn()
+#endif
+#ifndef mycrit
+#define mycrit if( log()->debugging(Debug::CRIT) ) log()->crit()
+#endif
+#ifndef mylog1
+#define mylog1 if( log()->debugging(Debug::LEVEL1) ) log()->level1()
+#endif
+#ifndef mylog2
+#define mylog2 if( log()->debugging(Debug::LEVEL2) ) log()->level2()
+#endif
+#ifndef mylog3
+#define mylog3 if( log()->debugging(Debug::LEVEL3) ) log()->level3()
+#endif
+#ifndef mylog4
+#define mylog4 if( log()->debugging(Debug::LEVEL4) ) log()->level4()
+#endif
+#ifndef mylog5
+#define mylog5 if( log()->debugging(Debug::LEVEL5) ) log()->level5()
+#endif
+#ifndef mylog6
+#define mylog6 if( log()->debugging(Debug::LEVEL6) ) log()->level6()
+#endif
+#ifndef mylog7
+#define mylog7 if( log()->debugging(Debug::LEVEL7) ) log()->level7()
+#endif
+#ifndef mylog8
+#define mylog8 if( log()->debugging(Debug::LEVEL8) ) log()->level8()
+#endif
+#ifndef mylog9
+#define mylog9 if( log()->debugging(Debug::LEVEL9) ) log()->level9()
+#endif
+#ifndef mylogany
+#define mylogany log()->any()
+#endif
+#ifndef vmonit
+#define vmonit( var ) vmon.add( #var, var )
+#endif
 
 		// Вспомогательные функции для удобства логирования
 		// ------------------------------------------------------------
@@ -107,16 +113,19 @@ class UObject_SK:
 		   \param id           - идентификатор датчика
 		   \param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
 		*/
-        std::string str( UniSetTypes::ObjectId id, bool showLinkName=true ) const;
+		std::string str( UniSetTypes::ObjectId id, bool showLinkName = true ) const;
 
 		/*! Вывод значения входа/выхода в формате: in_xxx(SensorName)=val
 		   \param id           - идентификатор датчика
 		   \param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
 		*/
-        std::string strval( UniSetTypes::ObjectId id, bool showLinkName=true ) const;        
+		std::string strval( UniSetTypes::ObjectId id, bool showLinkName = true ) const;
 
 		/*! Вывод состояния внутренних переменных */
-        inline std::string dumpVars(){ return std::move(vmon.pretty_str()); }
+		inline std::string dumpVars()
+		{
+			return std::move(vmon.pretty_str());
+		}
 		// ------------------------------------------------------------
 		std::string help() noexcept;
 
@@ -145,16 +154,19 @@ class UObject_SK:
 
 		virtual void callback() noexcept override;
 		virtual void processingMessage( const UniSetTypes::VoidMessage* msg ) override;
-		virtual void sysCommand( const UniSetTypes::SystemMessage* sm ){};
-		virtual void askSensors( UniversalIO::UIOCommand cmd ){}
-		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override{}
-		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override{}
+		virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) {};
+		virtual void askSensors( UniversalIO::UIOCommand cmd ) {}
+		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override {}
+		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override {}
 		virtual void sigterm( int signo ) override;
 		virtual bool activateObject() override;
-		virtual std::string getMonitInfo(){ return ""; } /*!< пользовательская информация выводимая в getInfo() */
+		virtual std::string getMonitInfo()
+		{
+			return "";    /*!< пользовательская информация выводимая в getInfo() */
+		}
 
 		// Выполнение очередного шага программы
-		virtual void step(){}
+		virtual void step() {}
 
 		void preAskSensors( UniversalIO::UIOCommand cmd );
 		void preSysCommand( const UniSetTypes::SystemMessage* sm );
@@ -183,9 +195,15 @@ class UObject_SK:
 
 		xmlNode* confnode;
 		/*! получить числовое свойство из конф. файла по привязанной confnode */
-		int getIntProp(const std::string& name) { return UniSetTypes::uniset_conf()->getIntProp(confnode, name); }
+		int getIntProp(const std::string& name)
+		{
+			return UniSetTypes::uniset_conf()->getIntProp(confnode, name);
+		}
 		/*! получить текстовое свойство из конф. файла по привязанной confnode */
-		inline const std::string getProp(const std::string& name) { return UniSetTypes::uniset_conf()->getProp(confnode, name); }
+		inline const std::string getProp(const std::string& name)
+		{
+			return UniSetTypes::uniset_conf()->getProp(confnode, name);
+		}
 
 		timeout_t smReadyTimeout; 	/*!< время ожидания готовности SM */
 		std::atomic_bool activated;

extensions/include/VTypes.h

@@ -114,7 +114,10 @@ namespace VTypes
 
 			// ------------------------------------------
 			// конструкторы на разные случаи...
-			F2r() noexcept { raw_backorder.val = 0; }
+			F2r() noexcept
+			{
+				raw_backorder.val = 0;
+			}
 
 			F2r( const float& f ) noexcept: F2(f)
 			{
@@ -383,7 +386,10 @@ namespace VTypes
 		public I2
 	{
 		public:
-			I2r() noexcept { raw_backorder.val = 0; }
+			I2r() noexcept
+			{
+				raw_backorder.val = 0;
+			}
 
 			I2r( const int v ) noexcept: I2(v)
 			{
@@ -457,7 +463,10 @@ namespace VTypes
 		public U2
 	{
 		public:
-			U2r() noexcept { raw_backorder.val = 0; }
+			U2r() noexcept
+			{
+				raw_backorder.val = 0;
+			}
 
 			U2r( int v ) noexcept: U2(v)
 			{

extensions/lib/Calibration.cc

@@ -41,7 +41,7 @@ Calibration::Part::Part( const Point& pleft, const Point& pright ) noexcept:
 	k(0)
 {
 	if( p_right.x < p_left.x )
-		std::swap(p_right,p_left);
+		std::swap(p_right, p_left);
 
 	// вычисление коэффициента наклона (один раз в конструкторе)
 	// k = (y2-y1)/(x2-x1)

extensions/tests/MBSlaveTest/TestProc.cc

@@ -200,7 +200,7 @@ void TestProc::test_thresholds()
 		ti = ui->getThresholdInfo(t_set_c, tid);
 		cerr << myname << ": ask ON threshold: " << ( ti.state == IONotifyController_i::HiThreshold  ? "ok" : "FAIL" ) << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		mylog2 << myname << ": CHECK 'ask and get threshold' FAILED: " << ex << endl;
 	}

extensions/tests/MBSlaveTest/TestProc.h

@@ -36,8 +36,8 @@ class TestProc:
 		void test_loglevel();
 
 	private:
-		bool state;
-		bool undef;
+		bool state = { false };
+		bool undef = { false };
 
 		std::vector<Debug::type> loglevels;
 		std::vector<Debug::type>::iterator lit;

extensions/tests/MBSlaveTest/mbslave-test.cc

@@ -50,11 +50,11 @@ int main(int argc, const char** argv)
 
 		return 0;
 	}
-	catch( const SystemError& err )
+	catch( const UniSetTypes::SystemError& err )
 	{
 		ucrit << "(smemory): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		ucrit << "(smemory): " << ex << endl;
 	}

extensions/tests/MQPerfTest/mq-test.cc

@@ -49,11 +49,11 @@ int main(int argc, const char** argv)
 
 		return 0;
 	}
-	catch( const SystemError& err )
+	catch( const UniSetTypes::SystemError& err )
 	{
 		cerr << "(mq-test): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(mq-test): " << ex << endl;
 	}

extensions/tests/SMemoryTest/TestProc.cc

@@ -53,8 +53,8 @@ void TestProc::sysCommand( const UniSetTypes::SystemMessage* sm )
 // -----------------------------------------------------------------------------
 string TestProc::getMonitInfo()
 {
-//	int* p = 0;
-//	(*p) = 10;
+	//	int* p = 0;
+	//	(*p) = 10;
 
 	return "";
 }
@@ -176,7 +176,7 @@ void TestProc::test_thresholds()
 		ti = ui->getThresholdInfo(t_set_c, tid);
 		cerr << myname << ": ask ON threshold: " << ( ti.state == IONotifyController_i::HiThreshold  ? "ok" : "FAIL" ) << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		mylog2 << myname << ": CHECK 'ask and get threshold' FAILED: " << ex << endl;
 	}

extensions/tests/SMemoryTest/smemory-test.cc

@@ -54,7 +54,7 @@ int main(int argc, const char** argv)
 	{
 		ucrit << "(smemory): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		ucrit << "(smemory): " << ex << endl;
 	}

extensions/tests/sm_perf_test.cc

@@ -117,11 +117,11 @@ int main(int argc, char* argv[] )
 		std::cerr << "elapsed time: " << elapsed_seconds << " ms\n";
 		return 0;
 	}
-	catch( const SystemError& err )
+	catch( const UniSetTypes::SystemError& err )
 	{
 		cerr << "(tests_with_sm): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_with_sm): " << ex << endl;
 	}

extensions/tests/tests_with_sm.cc

@@ -92,11 +92,11 @@ int main(int argc, const char* argv[] )
 
 		return session.run();
 	}
-	catch( const SystemError& err )
+	catch( const UniSetTypes::SystemError& err )
 	{
 		cerr << "(tests_with_sm): " << err << endl;
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		cerr << "(tests_with_sm): " << ex << endl;
 	}

include/DelayTimer.h

@@ -27,10 +27,10 @@
 class DelayTimer
 {
 	public:
-		DelayTimer(){}
+		DelayTimer() {}
 
 		DelayTimer( timeout_t on_msec, timeout_t off_msec ) noexcept:
-			onDelay(on_msec), offDelay(off_msec){}
+			onDelay(on_msec), offDelay(off_msec) {}
 
 		~DelayTimer() noexcept {}
 

include/IOController.h

@@ -260,7 +260,7 @@ class IOController:
 			USensorInfo( USensorInfo&& ) = default;
 			USensorInfo& operator=(USensorInfo&& ) = default;
 
-			USensorInfo(): d_value(0), d_off_value(0)
+			USensorInfo(): d_value(1), d_off_value(0)
 			{
 				d_si.id = UniSetTypes::DefaultObjectId;
 				d_si.node = UniSetTypes::DefaultObjectId;
@@ -298,8 +298,8 @@ class IOController:
 			ChangeUndefinedStateSignal sigUndefChange;
 
 			IOController_i::SensorInfo d_si;  /*!< идентификатор датчика, от которого зависит данный */
-			long d_value; /*!< разрешающее работу значение датчика от которого зависит данный */
-			long d_off_value; /*!< блокирующее значение */
+			long d_value = { 1 }; /*!< разрешающее работу значение датчика от которого зависит данный */
+			long d_off_value = { 0 }; /*!< блокирующее значение */
 			std::shared_ptr<USensorInfo> d_usi; // shared_ptr на датчик от которого зависит этот.
 
 			// функция обработки информации об изменении состояния датчика, от которого зависит данный

include/LT_Object.h

@@ -139,8 +139,8 @@ class LT_Object
 		/*! Информация о таймере */
 		struct TimerInfo
 		{
-			TimerInfo(): id(0), curTimeMS(0), priority(UniSetTypes::Message::High) {};
-			TimerInfo(UniSetTypes::TimerId id, timeout_t timeMS, clock_t cnt, UniSetTypes::Message::Priority p):
+			TimerInfo() {};
+			TimerInfo( UniSetTypes::TimerId id, timeout_t timeMS, clock_t cnt, UniSetTypes::Message::Priority p ):
 				id(id),
 				curTimeMS(timeMS),
 				priority(p),
@@ -155,15 +155,15 @@ class LT_Object
 				tmr.reset();
 			}
 
-			UniSetTypes::TimerId id;    /*!<  идентификатор таймера */
-			timeout_t curTimeMS;        /*!<  остаток времени */
-			UniSetTypes::Message::Priority priority; /*!<  приоритет посылаемого сообщения */
+			UniSetTypes::TimerId id = { 0 };    /*!<  идентификатор таймера */
+			timeout_t curTimeMS = { 0 };        /*!<  остаток времени */
+			UniSetTypes::Message::Priority priority = { UniSetTypes::Message::High }; /*!<  приоритет посылаемого сообщения */
 
 			/*!
 			 * текущий такт
-			 * \note Если задано количество -1 то сообщения будут поылатся постоянно
+			 * \note Если задано количество -1 то сообщения будут посылатся постоянно
 			*/
-			clock_t curTick;
+			clock_t curTick = { -1 };
 
 			// таймер с меньшим временем ожидания имеет больший приоритет
 			bool operator < ( const TimerInfo& ti ) const

include/NCRestorer.h

@@ -178,12 +178,12 @@ class NCRestorer_XML:
 		static xmlNode* bind_node( const std::shared_ptr<UniXML>& xml, xmlNode* root, const std::string& nodename, const std::string& nm = "");
 		static xmlNode* rebind_node( const std::shared_ptr<UniXML>& xml, xmlNode* root, const std::string& nodename, const std::string& nm = "");
 
-		std::string s_filterField;
-		std::string s_filterValue;
-		std::string t_filterField;
-		std::string t_filterValue;
+		std::string s_filterField = { "" };
+		std::string s_filterValue = { "" };
+		std::string t_filterField = { "" };
+		std::string t_filterValue = { "" };
 
-		std::string fname;
+		std::string fname = { "" };
 		std::shared_ptr<UniXML> uxml;
 		ReaderSlot rtslot;
 		NCReaderSlot ncrslot;

include/PassiveObject.h

@@ -62,11 +62,11 @@ class PassiveObject
 		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) {}
 		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) {}
 
-		std::string myname;
+		std::string myname = { "" };
+		ProxyManager* mngr = { nullptr };
 
-		ProxyManager* mngr;
 	private:
-		UniSetTypes::ObjectId id;
+		UniSetTypes::ObjectId id = { UniSetTypes::DefaultObjectId };
 };
 
 // -------------------------------------------------------------------------

include/PassiveTimer.h

@@ -55,7 +55,7 @@ class UniSetTimer
 		// некоторые классы могут не иметь подобных
 		// свойств.
 		virtual bool wait(timeout_t timeMS);   /*!< заснуть ожидая наступления времени */
-		virtual void terminate(){}            /*!< прервать работу таймера */
+		virtual void terminate() {}           /*!< прервать работу таймера */
 
 		/*! завершить работу таймера */
 		virtual void stop() noexcept;

include/Restorer.h

@@ -105,10 +105,10 @@ class Restorer_XML
 		ReaderSlot rslot;
 		ReaderSlot cslot;
 
-		std::string i_filterField;
-		std::string i_filterValue;
-		std::string c_filterField;
-		std::string c_filterValue;
+		std::string i_filterField = { "" };
+		std::string i_filterValue = { "" };
+		std::string c_filterField = { "" };
+		std::string c_filterValue = { "" };
 };
 // --------------------------------------------------------------------------
 #endif

include/UInterface.h

@@ -279,8 +279,8 @@ class UInterface
 				typedef std::unordered_map<UniSetTypes::KeyType, Item> CacheMap;
 				mutable CacheMap mcache;
 				mutable UniSetTypes::uniset_rwmutex cmutex;
-				size_t MaxSize;      /*!< максимальный размер кэша */
-				size_t minCallCount; /*!< минимальное количество вызовов, меньше которого ссылка считается устаревшей */
+				size_t MaxSize = { 20 };      /*!< максимальный размер кэша */
+				size_t minCallCount = { 20 }; /*!< минимальное количество вызовов, меньше которого ссылка считается устаревшей */
 		};
 
 		void initBackId( UniSetTypes::ObjectId backid );

include/UniSetActivator.h

@@ -114,7 +114,7 @@ class UniSetActivator:
 		TerminateEvent_Signal s_term;
 
 		std::atomic_bool omDestroy;
-		pid_t thid; // id orb потока
+		pid_t thid = { 0 }; // id orb потока
 
 		bool _noUseGdbForStackTrace = { false };
 

include/modbus/ModbusTCPMaster.h

@@ -18,8 +18,8 @@ class ModbusTCPMaster:
 		ModbusTCPMaster();
 		virtual ~ModbusTCPMaster();
 
-		bool connect( const std::string& addr, int port, bool closeOldConnection=true ) noexcept;
-		bool connect( const Poco::Net::SocketAddress& addr, int _port, bool closeOldConnection=true ) noexcept;
+		bool connect( const std::string& addr, int port, bool closeOldConnection = true ) noexcept;
+		bool connect( const Poco::Net::SocketAddress& addr, int _port, bool closeOldConnection = true ) noexcept;
 
 		void disconnect();
 		void forceDisconnect();

src/Communications/ComPort485F.cc

@@ -191,7 +191,7 @@ size_t ComPort485F::sendBlock(unsigned char* msg, size_t len )
 			m_read(2000);
 		}
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( tmit_ctrl_on )
 		{
@@ -234,7 +234,7 @@ void ComPort485F::sendByte( unsigned char x )
 		wq.push(x);
 		m_read(2000);
 	}
-	catch( const Exception& ex )
+	catch( const UniSetTypes::Exception& ex )
 	{
 		if( tmit_ctrl_on )
 		{

src/Communications/Modbus/ModbusClient.cc

@@ -391,7 +391,7 @@ mbErrCode ModbusClient::recv( ModbusAddr addr, ModbusByte qfunc,
 		cleanupChannel();
 		return erTimeOut;
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		if( dlog->is_crit() )
 			dlog->crit() << "(recv): " << ex << endl;
@@ -1326,7 +1326,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
 
 		return erTimeOut;
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		if( dlog->is_crit() )
 			dlog->crit() << "(recv): " << ex << endl;
@@ -1367,7 +1367,7 @@ mbErrCode ModbusClient::send( ModbusMessage& msg )
 		msg.swapHead();
 		return ex.err;
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		if( dlog->is_crit() )
 			dlog->crit() << "(send): " << ex << endl;

src/Communications/Modbus/ModbusRTUMaster.cc

@@ -142,7 +142,7 @@ mbErrCode ModbusRTUMaster::sendData(unsigned char* buf, size_t len )
 	{
 		port->sendBlock(buf, len);
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		dlog->crit() << "(send): " << ex << endl;
 		return erHardwareError;

src/Communications/Modbus/ModbusRTUSlave.cc

@@ -120,7 +120,7 @@ mbErrCode ModbusRTUSlave::sendData( unsigned char* buf, int len )
 	{
 		port->sendBlock(buf, len);
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		if( dlog->is_crit() )
 			dlog->crit() << "(send): " << ex << endl;

src/Communications/Modbus/ModbusServer.cc

@@ -63,7 +63,7 @@ void ModbusServer::setRecvTimeout( timeout_t msec )
 timeout_t ModbusServer::setReplyTimeout( timeout_t msec )
 {
 	// #warning "Why msec can be 0?"
-	assert(msec>0);
+	assert(msec > 0);
 
 	if( msec == UniSetTimer::WaitUpTime )
 		return replyTimeout_ms;
@@ -638,7 +638,7 @@ mbErrCode ModbusServer::recv( const std::unordered_set<ModbusRTU::ModbusAddr>& v
 		cleanupChannel();
 		return erSessionClosed;
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		dlog->crit() << "(recv): " << ex << endl;
 		cleanupChannel();
@@ -1775,7 +1775,7 @@ mbErrCode ModbusServer::send( ModbusMessage& msg )
 		sendData(msg.buf(), len);
 		msg.swapHead(); // обратно, т.к. потом ещё будет post_send_request
 	}
-	catch( const Exception& ex ) // SystemError
+	catch( const UniSetTypes::Exception& ex ) // SystemError
 	{
 		if( dlog->is_crit() )
 			dlog->crit() << "(ModbusServer::send): " << ex << endl;

src/Communications/Modbus/ModbusTCPMaster.cc

@@ -186,11 +186,11 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
 				{
 					try
 					{
-						Poco::Net::SocketAddress  iaddr = tcp->peerAddress();
+						Poco::Net::SocketAddress  ia = tcp->peerAddress();
 
 						dlog->warn() << "(ModbusTCPMaster::query): ret=" << ret
 									 << " < rmh=" << sizeof(reply.aduhead)
-									 << " perr: " << iaddr.host().toString() << ":" << iaddr.port()
+									 << " perr: " << ia.host().toString() << ":" << ia.port()
 									 << endl;
 					}
 					catch( const Poco::Net::NetException& ex )
@@ -201,8 +201,10 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
 				}
 
 				cleanInputStream();
+
 				if( tcp )
 					tcp->forceDisconnect();
+
 				return erTimeOut; // return erHardwareError;
 			}
 

src/Communications/Modbus/ModbusTypes.cc

@@ -427,7 +427,7 @@ void ReadCoilMessage::init( const ModbusMessage& m )
 	assert( m.pduhead.func == fnReadCoilStatus );
 	//	memset(this, 0, sizeof(*this));
 	memcpy(this, &m.pduhead, sizeof(m.pduhead));
-	memcpy(&start, m.data, szData());
+	memcpy(&start, &(m.data[0]), szData());
 
 	// переворачиваем слова
 	start = SWAPSHORT(start);
@@ -2273,7 +2273,7 @@ void DiagnosticMessage::init( const ModbusMessage& m )
 	func = m.pduhead.func;
 
 	memcpy( &subf, &(m.data[0]), sizeof(subf) );
-	int last = sizeof(subf);
+	size_t last = sizeof(subf);
 
 	subf = SWAPSHORT(subf);
 	count = szRequestDiagnosticData((DiagnosticsSubFunction)subf );
@@ -2281,15 +2281,15 @@ void DiagnosticMessage::init( const ModbusMessage& m )
 	if( count > MAXDATALEN )
 		throw mbException(erPacketTooLong);
 
-	if( count < 0 )
-		throw mbException(erBadDataValue);
-
+	if( count > 0 )
+	{
 		memcpy(&data, &(m.data[last]), sizeof(ModbusData)*count);
 		last += sizeof(ModbusData) * count;
 
 		// переворачиваем данные
 		for( size_t i = 0; i < count; i++ )
 			data[i] = SWAPSHORT(data[i]);
+	}
 
 	memcpy(&crc, &(m.data[last]), szCRC);
 }
@@ -3111,7 +3111,7 @@ ModbusMessage SetDateTimeMessage::transport_msg()
 	    mm.data[6] = century;
 	*/
 	size_t bcnt = 7;
-	memcpy( mm.data, &hour, bcnt );
+	memcpy( mm.data, &hour, bcnt ); // копируем начиная с адреса 'hour' 7 байт.
 
 	// пересчитываем CRC
 	ModbusData crc = checkCRC( (ModbusByte*)(&mm.pduhead), szModbusHeader + bcnt );
@@ -3175,7 +3175,7 @@ ModbusMessage SetDateTimeRetMessage::transport_msg()
 	// копируем заголовок и данные
 	memcpy(&mm.pduhead, this, szModbusHeader);
 
-	/*
+	size_t bcnt = 7;
 	mm.data[0] = hour;
 	mm.data[1] = min;
 	mm.data[2] = sec;
@@ -3183,9 +3183,6 @@ ModbusMessage SetDateTimeRetMessage::transport_msg()
 	mm.data[4] = mon;
 	mm.data[5] = year;
 	mm.data[6] = century;
-	*/
-	size_t bcnt = 7;
-	memcpy( mm.data, &hour, bcnt );
 
 	// пересчитываем CRC
 	ModbusData crc = checkCRC( (ModbusByte*)(&mm.pduhead), szModbusHeader + bcnt );
@@ -3508,8 +3505,7 @@ FileTransferRetMessage::FileTransferRetMessage( ModbusAddr _from ):
 bool FileTransferRetMessage::set( ModbusData nfile, ModbusData fpacks,
 								  ModbusData pack, ModbusByte* buf, ModbusByte len )
 {
-	if( len > sizeof(data) )
-		return false;
+	assert( std::numeric_limits<ModbusByte>::max() <= sizeof(data) );
 
 	clear();
 	memcpy(data, buf, len);

src/Communications/TCP/TCPCheck.cc

@@ -89,7 +89,7 @@ class TGuard
 	public:
 
 		TGuard( T* m, typename ThreadCreator<T>::Action a ):
-			t(m,a)
+			t(m, a)
 		{
 			t.start();
 		}

src/Communications/TCP/USocket.cc

@@ -9,7 +9,7 @@ USocket::~USocket()
 	{
 		close();
 	}
-	catch(...){}
+	catch(...) {}
 }
 // -------------------------------------------------------------------------
 USocket::USocket( int sock )

src/Communications/TCP/UTCPCore.cc

@@ -53,7 +53,7 @@ UTCPCore::Buffer::~Buffer()
 	delete [] data;
 }
 // -------------------------------------------------------------------------
-unsigned char*UTCPCore::Buffer::dpos() noexcept
+unsigned char* UTCPCore::Buffer::dpos() noexcept
 {
 	return data + pos;
 }

src/Communications/TCP/UTCPSocket.cc

@@ -16,7 +16,7 @@ UTCPSocket::~UTCPSocket()
 	{
 		Poco::Net::ServerSocket::close();
 	}
-	catch(...){}
+	catch(...) {}
 }
 // -------------------------------------------------------------------------
 UTCPSocket::UTCPSocket()

src/Communications/TCP/UTCPStream.cc

@@ -65,7 +65,7 @@ void UTCPStream::forceDisconnect()
 		setLinger(false, 0);
 	}
 	//	catch( Poco::Net::NetException& ex ){}
-	catch( std::exception& ex ){}
+	catch( std::exception& ex ) {}
 
 	try
 	{
@@ -73,7 +73,7 @@ void UTCPStream::forceDisconnect()
 		//shutdown();
 	}
 	//	catch( Poco::Net::NetException& ex ){}
-	catch( std::exception& ex ){}
+	catch( std::exception& ex ) {}
 }
 // -------------------------------------------------------------------------
 void UTCPStream::disconnect()
@@ -82,15 +82,15 @@ void UTCPStream::disconnect()
 	{
 		shutdown();
 	}
-//	catch( Poco::Net::NetException& ex ){}
-	catch( std::exception& ex ){}
+	//	catch( Poco::Net::NetException& ex ){}
+	catch( std::exception& ex ) {}
 
 	try
 	{
 		close();
 	}
-//	catch( Poco::Net::NetException& ex ){}
-	catch( std::exception& ex ){}
+	//	catch( Poco::Net::NetException& ex ){}
+	catch( std::exception& ex ) {}
 }
 // -------------------------------------------------------------------------
 int UTCPStream::getSocket() const
@@ -116,7 +116,7 @@ void UTCPStream::create( const std::string& hname, int port, timeout_t tout_msec
 bool UTCPStream::isConnected() noexcept
 {
 	return ( Poco::Net::StreamSocket::sockfd() != POCO_INVALID_SOCKET );
-/*
+	/*
 		try
 		{
 			// Вариант 1
@@ -126,14 +126,14 @@ bool UTCPStream::isConnected() noexcept
 			return ( Poco::Net::StreamSocket::peerAddress().port() != 0 );
 
 			// Вариант 3
-//		if( poll({0, 5}, Poco::Net::Socket::SELECT_READ) )
-//			return (tcp->available() > 0);
+	//		if( poll({0, 5}, Poco::Net::Socket::SELECT_READ) )
+	//			return (tcp->available() > 0);
 		}
 		catch( Poco::Net::NetException& ex )
 		{
 		}
 
 		return false;
-*/
+	*/
 }
 // -------------------------------------------------------------------------