const char** (const char * char *)

Utilities/Admin/admin.cc

@@ -151,7 +151,7 @@ static void usage()
 		TransportMessage      .
 */
 // --------------------------------------------------------------------------------------
-int main(int argc, const char** argv)
+int main(int argc, char** argv)
 {
 	try
 	{
@@ -159,7 +159,7 @@ int main(int argc, const char** argv)
 		char opt = 0;
 
 
-	while( (opt = getopt_long(argc, (char * const*)argv, "hc:beomsfur:l:a:n:d:i:v:t:x:j:g:k:w:p:y:",longopts,&optindex)) != -1 ) 
+	while( (opt = getopt_long(argc, argv, "hc:beomsfur:l:a:n:d:i:v:t:x:j:g:k:w:p:y:",longopts,&optindex)) != -1 ) 
 	{
 		switch (opt) //  
 		{

Utilities/DBServer-MySQL/main.cc

@@ -13,7 +13,7 @@ static void short_usage()
 	cout << "Usage: uniset-dbserver [--name ObjectId] [--confile configure.xml]\n";
 }
 // --------------------------------------------------------------------------
-int main(int argc, const char** argv)
+int main(int argc, char** argv)
 {
 	try
 	{

Utilities/InfoServer/main.cc

@@ -15,7 +15,7 @@ static void short_usage()
 		 << " [--confile configure.xml]\n";
 }
 // --------------------------------------------------------------------------
-int main(int argc, const char** argv)
+int main(int argc, char** argv)
 {
 	try
 	{

Utilities/NullController/main.cc

@@ -22,7 +22,7 @@ static void short_usage()
 		 << " --dbDumping [0,1] -   dump- \n";
 }
 // --------------------------------------------------------------------------
-int main(int argc, const char** argv)
+int main(int argc, char** argv)
 {
 	try
 	{

extensions/IOControl/IOControl.cc

@@ -873,7 +873,7 @@ void IOControl::check_testlamp()
 }
 
 // -----------------------------------------------------------------------------
-IOControl* IOControl::init_iocontrol( int argc, const char** argv,
+IOControl* IOControl::init_iocontrol( int argc, const char* const* argv,
 										UniSetTypes::ObjectId icID, SharedMemory* ic )
 {
 	string name = conf->getArgParam("--io-name","IOControl1");
@@ -901,7 +901,7 @@ IOControl* IOControl::init_iocontrol( int argc, const char** argv,
 	return new IOControl(ID,icID,ic,numcards);
 }
 // -----------------------------------------------------------------------------
-void IOControl::help_print( int argc, const char** argv )
+void IOControl::help_print( int argc, const char* const* argv )
 {
 	cout << "--io-confnode name -     xml-" << endl;
 	cout << "--io-name name		- ID .   IOController1." << endl;

extensions/IOControl/IOControl.h

@@ -67,10 +67,10 @@ class IOControl:
 		virtual ~IOControl();
 
 		/*!      */
-		static IOControl* init_iocontrol( int argc, const char** argv,
+		static IOControl* init_iocontrol( int argc, const char* const* argv,
 											UniSetTypes::ObjectId icID, SharedMemory* ic=0 );
 		/*!     help- */
-		static void help_print( int argc, const char** argv );
+		static void help_print( int argc, const char* const* argv );
 
 //		inline std::string getName(){ return myname; }
 

extensions/MBTCPMaster/MBMaster.cc

@@ -795,7 +795,7 @@ void MBMaster::initIterators()
 	shm->initAIterator(aitHeartBeat);
 }
 // -----------------------------------------------------------------------------
-void MBMaster::help_print( int argc, const char** argv )
+void MBMaster::help_print( int argc, const char* const* argv )
 {
 	cout << "Default: prefix='mbtcp'" << endl;
 	cout << "--prefix-polltime msec	-    .   200 ." << endl;
@@ -813,7 +813,7 @@ void MBMaster::help_print( int argc, const char** argv )
 	cout << "--prefix-recv-timeout -    ." << endl;
 }
 // -----------------------------------------------------------------------------
-MBMaster* MBMaster::init_mbmaster( int argc, const char** argv, UniSetTypes::ObjectId shmID, SharedMemory* ic,
+MBMaster* MBMaster::init_mbmaster( int argc, const char* const* argv, UniSetTypes::ObjectId shmID, SharedMemory* ic,
 							std::string prefix )
 {
 	string name = conf->getArgParam("--" + prefix + "-name","MBTCPMaster1");

extensions/MBTCPMaster/MBMaster.h

@@ -24,11 +24,11 @@ class MBMaster:
 		virtual ~MBMaster();
 	
 		/*!      */
-		static MBMaster* init_mbmaster( int argc, const char** argv, UniSetTypes::ObjectId shmID, SharedMemory* ic=0,
+		static MBMaster* init_mbmaster( int argc, const char* const* argv, UniSetTypes::ObjectId shmID, SharedMemory* ic=0,
 										std::string prefix="mbtcp" );
 
 		/*!     help- */
-		static void help_print( int argc, const char** argv );
+		static void help_print( int argc, const char* const* argv );
 
 		static const int NoSafetyState=-1;
 

extensions/MBTCPMaster/main.cc

@@ -11,7 +11,7 @@ using namespace std;
 using namespace UniSetTypes;
 using namespace UniSetExtensions;
 // -----------------------------------------------------------------------------
-int main( int argc, const char** argv )
+int main( int argc, char** argv )
 {
 	if( argc>1 && (!strcmp(argv[1],"--help") || !strcmp(argv[1],"-h")) )
 	{

extensions/ModbusSlave/MBSlave.cc

@@ -723,7 +723,7 @@ void MBSlave::initIterators()
 	shm->initAIterator(aitAskCount);
 }
 // -----------------------------------------------------------------------------
-void MBSlave::help_print( int argc, const char** argv )
+void MBSlave::help_print( int argc, const char* const* argv )
 {
 	cout << "Default: prefix='mbtcp'" << endl;
 	cout << "--prefix-heartbeat-id		-       heartbeat-." << endl;
@@ -746,7 +746,7 @@ void MBSlave::help_print( int argc, const char** argv )
 	cout << "--prefix-inet-port num - this modbus server port. Default: 502" << endl;
 }
 // -----------------------------------------------------------------------------
-MBSlave* MBSlave::init_mbslave( int argc, const char** argv, UniSetTypes::ObjectId icID, SharedMemory* ic,
+MBSlave* MBSlave::init_mbslave( int argc, const char* const* argv, UniSetTypes::ObjectId icID, SharedMemory* ic,
 								string prefix )
 {
 	string name = conf->getArgParam("--" + prefix + "-name","MBSlave1");

extensions/ModbusSlave/MBSlave.h

@@ -26,12 +26,12 @@ class MBSlave:
 		virtual ~MBSlave();
 	
 		/*!      */
-		static MBSlave* init_mbslave( int argc, const char** argv,
+		static MBSlave* init_mbslave( int argc, const char* const* argv,
 											UniSetTypes::ObjectId shmID, SharedMemory* ic=0,
 											std::string prefix="mbs" );
 
 		/*!     help- */
-		static void help_print( int argc, const char** argv );
+		static void help_print( int argc, const char* const* argv );
 
 		static const int NoSafetyState=-1;
 

extensions/RTUExchange/RTUExchange.cc

@@ -1406,7 +1406,7 @@ void RTUExchange::initIterators()
 
 }
 // -----------------------------------------------------------------------------
-void RTUExchange::help_print( int argc, const char** argv )
+void RTUExchange::help_print( int argc, const char* const* argv )
 {
 	cout << "--rs-polltime msec     -    .   200 ." << endl;
 	cout << "--rs-heartbeat-id      -       heartbeat-." << endl;
@@ -1422,7 +1422,7 @@ void RTUExchange::help_print( int argc, const char** argv )
 	cout << "--rs-recv-timeout -    ." << endl;
 }
 // -----------------------------------------------------------------------------
-RTUExchange* RTUExchange::init_rtuexchange( int argc, const char** argv, UniSetTypes::ObjectId icID, SharedMemory* ic )
+RTUExchange* RTUExchange::init_rtuexchange( int argc, const char* const* argv, UniSetTypes::ObjectId icID, SharedMemory* ic )
 {
 	string name = conf->getArgParam("--rs-name","RTUExchange1");
 	if( name.empty() )

extensions/RTUExchange/RTUExchange.h

@@ -29,11 +29,11 @@ class RTUExchange:
 		virtual ~RTUExchange();
 	
 		/*!      */
-		static RTUExchange* init_rtuexchange( int argc, const char** argv,
+		static RTUExchange* init_rtuexchange( int argc, const char* const* argv,
 											UniSetTypes::ObjectId shmID, SharedMemory* ic=0 );
 
 		/*!     help- */
-		static void help_print( int argc, const char** argv );
+		static void help_print( int argc, const char* const* argv );
 
 		static const int NoSafetyState=-1;
 

extensions/RTUExchange/rtuexchange.cc

@@ -9,7 +9,7 @@ using namespace std;
 using namespace UniSetTypes;
 using namespace UniSetExtensions;
 // -----------------------------------------------------------------------------
-int main( int argc, const char** argv )
+int main( int argc, char** argv )
 {
 	try
 	{

extensions/SharedMemory/SharedMemory.cc

@@ -435,7 +435,7 @@ void SharedMemory::fastSaveValue(const IOController_i::SensorInfo& si, CORBA::Lo
 	IONotifyController_LT::fastSaveValue(si,value,type,sup_id);
 }					
 // ------------------------------------------------------------------------------------------
-SharedMemory* SharedMemory::init_smemory( int argc, const char** argv )
+SharedMemory* SharedMemory::init_smemory( int argc, const char* const* argv )
 {
 	string dfile = conf->getArgParam("--datfile", conf->getConfFileName());
 
@@ -455,7 +455,7 @@ SharedMemory* SharedMemory::init_smemory( int argc, const char** argv )
 	return new SharedMemory(ID,dfile);
 }
 // -----------------------------------------------------------------------------
-void SharedMemory::help_print( int argc, const char** argv )
+void SharedMemory::help_print( int argc, const char* const* argv )
 {
 	cout << "--smemory-id           - SharedMemeory ID" << endl;
 	cout << "--logfile fname	-     fname.   smemory.log" << endl;

extensions/SharedMemory/SharedMemory.h

@@ -27,9 +27,9 @@ class SharedMemory:
 		virtual ~SharedMemory();
 
 		/*!      */
-		static SharedMemory* init_smemory( int argc, const char** argv );
+		static SharedMemory* init_smemory( int argc, const char* const* argv );
 		/*!     help- */
-		static void help_print( int argc, const char** argv );
+		static void help_print( int argc, const char* const* argv );
 
 
 	    virtual void saveValue(const IOController_i::SensorInfo& si, CORBA::Long value,

extensions/UDPExchange/udpexchange.cc

@@ -9,7 +9,7 @@ using namespace std;
 using namespace UniSetTypes;
 using namespace UniSetExtensions;
 // -----------------------------------------------------------------------------
-int main( int argc, const char** argv )
+int main( int argc, char** argv )
 {
 	try
 	{

include/Configuration.h

@@ -58,13 +58,13 @@ namespace UniSetTypes
 			virtual ~Configuration();
 
 			/*!	 xml- (   )	*/
-			Configuration( int argc, const char** argv, const std::string xmlfile="" );
+			Configuration( int argc, const char* const* argv, const std::string xmlfile="" );
 
 			/*!	 xml-	*/
-			Configuration( int argc, const char** argv, ObjectIndex* oind, const std::string xmlfile="" );
+			Configuration( int argc, const char* const* argv, ObjectIndex* oind, const std::string xmlfile="" );
 
 			/*!  ,     */
-			Configuration( int argc, const char** argv,
+			Configuration( int argc, const char* const* argv,
 							const std::string fileConf, UniSetTypes::ObjectInfo* objectsMap );
 
 		///     ԣ path
@@ -82,7 +82,7 @@ namespace UniSetTypes
 
 		std::string getRootDir(); /*!<  ,      */
 		inline int getArgc(){ return _argc; }
-		inline const char** getArgv() const { return _argv; }
+		inline const char* const* getArgv() const { return _argv; }
 		inline ObjectId getTimerService() const { return localTimerService; } /*!<   TimerServic- */
 		inline ObjectId getDBServer() const { return localDBServer; }		/*!<   DBServer- */
 		inline ObjectId getInfoServer() const { return localInfoServer; }	/*!<   InfoServer- */
@@ -158,7 +158,7 @@ namespace UniSetTypes
 	protected:
 		Configuration();
 
-		virtual void initConfiguration(int argc, const char** argv);
+		virtual void initConfiguration(int argc, const char* const* argv);
 		
 		void createNodesList();
 		virtual void initNode( UniSetTypes::NodeInfo& ninfo, UniXML_iterator& it);
@@ -177,7 +177,7 @@ namespace UniSetTypes
 		UniXML unixml;
 
 		int _argc;
-		const char** _argv;
+		const char* const* _argv;
 		CORBA::ORB_var orb;
 		CORBA::PolicyList policyList;
 		
@@ -230,7 +230,7 @@ namespace UniSetTypes
 	
 	//  UniSetTypes::conf.
 	// (     --confile  --id-from-config )
-	void uniset_init( int argc, const char** argv, const std::string xmlfile="configure.xml" );
+	void uniset_init( int argc, const char* const* argv, const std::string xmlfile="configure.xml" );
 	
 	
 }	// end of UniSetTypes namespace

include/ORepHelpers.h

@@ -44,8 +44,8 @@ namespace ORepHelpers
 
     //!      
     CosNaming::NamingContext_ptr getContext(const std::string& cname, int argc,
-											const char** argv, const std::string& nsName)
-															throw(UniSetTypes::ORepFailed);
+						const char* const* argv, const std::string& nsName)
+						throw(UniSetTypes::ORepFailed);
 
 	CosNaming::NamingContext_ptr getContext(CORBA::ORB_ptr orb, const std::string& cname,
 											const std::string& nsName)

include/UniSetTypes.h

@@ -146,7 +146,7 @@ namespace UniSetTypes
 		\param defval - ,   ,    
 	*/
 	inline std::string getArgParam( const std::string name, 
-										int _argc, const char** _argv,
+										int _argc, const char* const* _argv,
 											const std::string defval="" )
 	{
 		for( int i=1; i < (_argc - 1) ; i++ )
@@ -162,7 +162,7 @@ namespace UniSetTypes
 		\return  -1,    . 
 			  ,  .
 	*/
-	inline int findArgParam( const std::string name, int _argc, const char** _argv )
+	inline int findArgParam( const std::string name, int _argc, const char* const* _argv )
 	{
 		for( int i=1; i<_argc; i++ )
 		{

src/ObjectRepository/ORepHelpers.cc

@@ -44,7 +44,7 @@ namespace ORepHelpers
      *	\param cname -      ,  . 
      *	\param argc, argv  -   ORB      
     */
-	CosNaming::NamingContext_ptr getContext(const string& cname, int argc, const char** argv, const string& nsName )throw(ORepFailed)
+	CosNaming::NamingContext_ptr getContext(const string& cname, int argc, const char* const* argv, const string& nsName )throw(ORepFailed)
     {
 		CORBA::ORB_var orb = CORBA::ORB_init( argc, (char**)argv );
 		unideb[Debug::REPOSITORY] << "OREPHELP: orb init ok"<< endl;

src/ObjectRepository/ObjectRepositoryFactory.cc

@@ -74,7 +74,7 @@ bool ObjectRepositoryFactory::createSection( const char* name, const char* in_se
 	}
 	
 	int argc(uconf->getArgc());
-	const char **argv(uconf->getArgv());
+	const char * const* argv(uconf->getArgv());
 	CosNaming::NamingContext_var ctx = ORepHelpers::getContext(in_section, argc, argv, uconf->getNSName() );
 	return createContext( name, ctx.in() );
 }
@@ -223,7 +223,7 @@ bool ObjectRepositoryFactory::removeSection(const string& fullName, bool recursi
 	try
 	{	
 		int argc(uconf->getArgc());
-		const char **argv(uconf->getArgv());
+		const char * const* argv(uconf->getArgv());
 		ctx = ORepHelpers::getContext(fullName, argc, argv, nsName);
 	}
 	catch( ORepFailed )
@@ -285,7 +285,7 @@ bool ObjectRepositoryFactory::removeSection(const string& fullName, bool recursi
 		try
 		{
 			int argc(uconf->getArgc());
-			const char **argv(uconf->getArgv());
+			const char * const* argv(uconf->getArgv());
 			CosNaming::Name_var ctxName = omniURI::stringToName(name.c_str());
 			CosNaming::NamingContext_var in_ctx = ORepHelpers::getContext(in_sec, argc, argv, nsName);
 			ctx->destroy();
@@ -327,7 +327,7 @@ bool ObjectRepositoryFactory::renameSection( const string& newFName, const strin
 //		unideb[Debug::REPOSITORY] << "ORepFactory:   "<< in_sec << endl; 
 //		unideb[Debug::REPOSITORY] << "ORepFactory:  " << oldFName << "  " << newFName << endl;				
 		int argc(uconf->getArgc());
-		const char **argv(uconf->getArgv());
+		const char * const* argv(uconf->getArgv());
 		CosNaming::NamingContext_var in_ctx = ORepHelpers::getContext(in_sec, argc, argv, nsName);    
 		CosNaming::NamingContext_var ctx = ORepHelpers::getContext(oldFName, argc, argv, nsName);