(Configuration): Исправил баг. Обращение через "conf->"

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.3
-Release: alt1
+Release: alt2
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -213,6 +213,9 @@ rm -f %buildroot%_libdir/*.la
 
 
 %changelog
+* Mon Dec 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.3-alt2
+- fixed buf in Configuration
+
 * Mon Dec 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.3-alt1
 - Added support for multiple profiles(Configuration) simultaneously
 

src/Various/Configuration.cc

@@ -782,7 +782,7 @@ void Configuration::createNodesList()
 // -------------------------------------------------------------------------
 void Configuration::initNode( UniSetTypes::NodeInfo& ninfo, UniXML_iterator& it )
 {
-	if( ninfo.id == conf->getLocalNode() )
+	if( ninfo.id == getLocalNode() )
 		ninfo.connected = true;
 	else
 		ninfo.connected = false;
@@ -807,7 +807,7 @@ xmlNode* Configuration::initDebug( DebugStream& deb, const string& _debname )
 
 	string debname(_debname);
 
-	xmlNode* dnode = conf->getNode(_debname);
+	xmlNode* dnode = getNode(_debname);
 	if( dnode == NULL )
 		deb << "(Configuration)(initDebug):  WARNING! Not found conf. section for log '" << _debname  << "'" << endl;
 	else
@@ -963,7 +963,7 @@ ObjectId Configuration::getSensorID( const std::string name )
 	if( name.empty() )
 		return DefaultObjectId;
 		
-	return oind->getIdByName(conf->getSensorsSection()+"/"+name);
+	return oind->getIdByName(getSensorsSection()+"/"+name);
 }
 // -------------------------------------------------------------------------
 ObjectId Configuration::getControllerID( const std::string name )
@@ -971,7 +971,7 @@ ObjectId Configuration::getControllerID( const std::string name )
 	if( name.empty() )
 		return DefaultObjectId;
 
-	return oind->getIdByName(conf->getControllersSection()+"/"+name);
+	return oind->getIdByName(getControllersSection()+"/"+name);
 }
 // -------------------------------------------------------------------------
 ObjectId Configuration::getObjectID( const std::string name )
@@ -979,7 +979,7 @@ ObjectId Configuration::getObjectID( const std::string name )
 	if( name.empty() )
 		return DefaultObjectId;
 
-	return oind->getIdByName(conf->getObjectsSection()+"/"+name);
+	return oind->getIdByName(getObjectsSection()+"/"+name);
 }
 // -------------------------------------------------------------------------
 ObjectId Configuration::getServiceID( const std::string name )
@@ -987,7 +987,7 @@ ObjectId Configuration::getServiceID( const std::string name )
 	if( name.empty() )
 		return DefaultObjectId;
 
-	return oind->getIdByName(conf->getServicesSection()+"/"+name);
+	return oind->getIdByName(getServicesSection()+"/"+name);
 }
 // -------------------------------------------------------------------------
 UniSetTypes::ObjectId Configuration::getNodeID( const std::string name, std::string alias )