diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FT_App')
16 files changed, 51 insertions, 27 deletions
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp index 253e373e20b..fe0458110c5 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<StubFaultAnalyzer> server_run("FaultAnalyzer"); return server_run.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index 131b6daa877..729b18bbb41 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<TAO::PG_FactoryRegistry> server_main("FactoryRegistry"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp index f5e732d47ab..571ae796aea 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter> server_main("FaultConsumer"); return server_main.run(argc, argv); diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp index 2ae607f7f0f..784a3109c15 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp @@ -18,6 +18,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<StubFaultNotifier> server_main("FaultNotifier"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 2c77a1e7750..728d1e885ac 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -8,6 +8,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" class FTClientMain { @@ -171,7 +172,7 @@ FTClientMain::parse_args (int argc, char *argv[]) // note: dfnkx are simple_util options // include them here so we can detect bad args - ACE_Get_Opt get_opts (argc, argv, "c:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:f:"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -181,7 +182,7 @@ FTClientMain::parse_args (int argc, char *argv[]) case 'c': { this->inFileName_ = get_opts.opt_arg (); - this->inFile_ = ACE_OS::fopen (this->inFileName_, "r"); + this->inFile_ = ACE_OS::fopen (this->inFileName_, ACE_TEXT("r")); if(this->inFile_ && !ferror (this->inFile_)) { ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_); @@ -530,7 +531,7 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL) else { ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", this->replica_pos_); } return result; @@ -624,10 +625,12 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + FTClientMain app; - int result = app.parse_args(argc, argv); + int result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { ACE_TRY_NEW_ENV diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 996c2a27fb7..a7d01ca3c28 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -19,6 +19,7 @@ #include <ace/Get_Opt.h> #include <ace/OS_NS_stdio.h> +#include "ace/Argv_Type_Converter.h" FTAPP::FT_Creator::FT_Creator () : creator_ () @@ -43,7 +44,7 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "r:ignf:u:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "r:ignf:u:p:"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -255,15 +256,17 @@ int FTAPP::FT_Creator::fini () } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); ACE_TRY_CHECK; FTAPP::FT_Creator app; - result = app.parse_args(argc, argv); + result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = app.init (orb.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp index 1fcc2339969..0eb71bf1f77 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<FT_ReplicaFactory_i> server_main("TestReplicaFactory"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index ba8b3d7e58d..0fef5007a56 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -13,6 +13,7 @@ #include "FT_ReplicaFactory_i.h" #include "FT_TestReplica_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/PortableGroupC.h" @@ -141,7 +142,7 @@ void FT_ReplicaFactory_i::shutdown_i() int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); @@ -162,7 +163,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) int FT_ReplicaFactory_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:f:i:l:t:qu"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:f:i:l:t:qu"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 16f1f70eee4..f338e079ecc 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -6,6 +6,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" // A simple class for building a client that "controls' the // Replication Manager (right now it just shuts it down). @@ -89,9 +90,8 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[]) if (CORBA::is_nil (this->replication_manager_.in())) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO_FT_ReplicationManagerController::init: " - "Could not get Replication Manager's IOR.\n") + ACE_TEXT ("TAO_FT_ReplicationManagerController::init: ") + ACE_TEXT ("Could not get Replication Manager's IOR.\n") )); result = -1; } @@ -116,7 +116,7 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -186,11 +186,13 @@ int TAO_FT_ReplicationManagerController::run () return result; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; TAO_FT_ReplicationManagerController rmctrl; - result = rmctrl.init (argc, argv); + result = rmctrl.init (convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = rmctrl.run (); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index ad89659b3bc..3cd2451a91e 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -451,7 +451,7 @@ void FT_TestReplica_i::request_quit() void FT_TestReplica_i::store(long counter) { - FILE * f = ACE_OS::fopen("Persistent.dat", "w"); + FILE * f = ACE_OS::fopen("Persistent.dat", ACE_TEXT("w")); if(f != 0) { unsigned char* buffer = 0; @@ -472,7 +472,7 @@ void FT_TestReplica_i::store(long counter) long FT_TestReplica_i::load () { long counter = 0; - FILE * f = ACE_OS::fopen("Persistent.dat","r"); + FILE * f = ACE_OS::fopen("Persistent.dat",ACE_TEXT("r")); if(f != 0) { unsigned char buffer[sizeof(long)]; diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 12357cb9297..632de09d56b 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -4,6 +4,7 @@ #include "ReplicationManagerFaultConsumerAdapter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" // FUZZ: disable check_for_streams_include @@ -38,7 +39,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -335,7 +336,7 @@ int ReplicationManagerFaultConsumerAdapter::init ( // Signal that we are ready to go. if (result == 0 && this->readyFile_ != 0) { - FILE* ready = ACE_OS::fopen (this->readyFile_, "w"); + FILE* ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w")); if (ready) { ACE_OS::fprintf (ready, "ready\n"); diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 6d0e445511f..66c9fd5ab58 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -4,6 +4,7 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index 56731cf5f59..2f1ddc40202 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -4,6 +4,7 @@ #include "StubFaultAnalyzer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -25,7 +26,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer () int StubFaultAnalyzer::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -228,7 +229,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) if (result == 0 && this->readyFile_ != 0) { - FILE *ready = ACE_OS::fopen (this->readyFile_, "w"); + FILE *ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w")); if ( ready ) { ACE_OS::fprintf (ready, "ready\n"); diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 25a2934df15..33731acec0e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -4,6 +4,7 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () @@ -40,7 +41,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[]) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); #else // NO_ARGS_FOR_NOW - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 24c320efb8e..4fd2e6b5f0c 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -4,6 +4,7 @@ #include "StubFaultNotifier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include @@ -35,7 +36,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const int StubFaultNotifier::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -324,7 +325,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) int StubFaultNotifier::write_ior_file() { int result = -1; - FILE* out = ACE_OS::fopen (this->ior_output_file_, "w"); + FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", this->ior_.in ()); diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 8bb35b960a1..8cbd09b8a6c 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -453,7 +453,7 @@ int TAO::Object_Group_Creator::fini () int TAO::Object_Group_Creator::write_ior_file (const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); |