ChangeLogTag: Fri Jun 27 12:55:00 UTC 2008 Simon Massey <sma at prismtech dot com>

9 files changed, 48 insertions, 39 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a55708f6fc8..0bb722b1ec1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jun 27 12:55:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.h:
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/server.h:
+        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp:
+
+          Fix fuzz errors incorrect ACE_TMAIN/main use.
+
 Fri Jun 27 12:20:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
         * orbsvcs/tests/AVStreams/Latency/ping.cpp:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 1cdd3716cb5..3899d04da8b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -59,10 +59,10 @@ Client::set_protocol_object (TAO_AV_Protocol_Object *object)
 
 int
 Client::parse_args (int argc,
-                    char **argv)
+                    ACE_TCHAR *argv[])
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc,argv,"f:l:a:p:r:sd");
+  ACE_Get_Opt opts (argc, argv, "f:l:a:p:r:sd");
 
   this->use_sfp_ = 0;
 
@@ -72,16 +72,16 @@ Client::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = ACE_OS::strdup (opts.opt_arg ());
+          this->filename_ = ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()));
           break;
         case 'l':
-          this->address_ = ACE_OS::strdup (opts.opt_arg ());
+          this->address_ = ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()));
           break;
         case 'a':
-          this->peer_addr_str_ = ACE_OS::strdup (opts.opt_arg ());
+          this->peer_addr_str_ = ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()));
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
+          this->protocol_ = ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()));
           break;
         case 'r':
           this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
@@ -158,7 +158,7 @@ Client::bind_to_server (void)
 
 int
 Client::init (int argc,
-              char **argv)
+              ACE_TCHAR *argv[])
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -399,8 +399,7 @@ Client::pace_data (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 76f79679002..50ae2bb556c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -88,7 +88,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR *argv[]);
   // Method to initialize the various data components.
 
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -110,7 +110,7 @@ public:
   // The requested frame rate for sending each frame of data read from the file.
 
 private:
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Method to parse the command line arguments.
 
   int bind_to_server (void);
@@ -132,7 +132,7 @@ private:
   // Number of frames sent.
 
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
 
   const char *filename_;
   // File from which data is read.
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index a4f3b58952c..5f4586d2548 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -8,7 +8,7 @@
 static FILE *output_file = 0;
 // File into which the received data is written.
 
-static const char *output_file_name = "output";
+static const ACE_TCHAR *output_file_name = ACE_TEXT ("output");
 // File handle of the file into which data is written.
 
 int done = 0;
@@ -74,7 +74,7 @@ Server::~Server (void)
 
 int
 Server::init (int,
-              char **)
+              ACE_TCHAR *[])
 {
   int result =
     this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
@@ -111,7 +111,7 @@ Server::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+            ACE_TCHAR *argv[])
 {
   ACE_Get_Opt opts (argc,
                     argv,
@@ -136,8 +136,7 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index e9040e1f39f..bdb3544c767 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -77,7 +77,7 @@ public:
   // Deestructor.
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR *argv[]);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 52c6018c51b..c6e366fe5f3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -7,10 +7,10 @@
 static FILE *output_file = 0;
 // File handle of the file into which received data is written.
 
-static const char *output_file_name = "output";
+static const ACE_TCHAR *output_file_name = ACE_TEXT ("output");
 // File name of the file into which received data is written.
 
-static const char* stats_file_name = "Stats.dat";
+static const ACE_TCHAR *stats_file_name = ACE_TEXT ("Stats.dat");
 
 int stats [1000010];
 long stats_index = 0;
@@ -123,7 +123,7 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  dump_samples (stats_file_name);
+  dump_samples (ACE_TEXT_ALWAYS_CHAR (stats_file_name));
 
   try
     {
@@ -150,7 +150,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **)
+                ACE_TCHAR *[])
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -194,7 +194,7 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+            ACE_TCHAR *argv[])
 {
   // Parse the command line arguments
   ACE_Get_Opt opts (argc,
@@ -223,8 +223,7 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -261,7 +260,7 @@ main (int argc,
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
-                           ACE_TEXT_CHAR_TO_TCHAR (output_file_name)),
+                           output_file_name),
                           -1);
 
       else
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 1023828a24e..3c00059838b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -90,7 +90,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR *argv[]);
   // Initialize data components.
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 3da289c970d..0f949e89a12 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -38,9 +38,9 @@ Sender::Sender (void)
   : sender_mmdevice_ (0),
     streamctrl_ (0),
     frame_count_ (0),
-    filename_ ("input"),
+    filename_ (ACE_TEXT ("input")),
     input_file_ (0),
-    protocol_ ("UDP"),
+    protocol_ (ACE_TEXT ("UDP")),
     frame_rate_ (30.0),
     mb_ (1000),
     address_ (0),
@@ -63,7 +63,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 
 int
 Sender::parse_args (int argc,
-                    char **argv)
+                    ACE_TCHAR *argv[])
 {
   // Parse command line arguments
   ACE_Get_Opt opts (argc, argv, "f:p:r:dl:a:s:b:");
@@ -165,7 +165,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv)
+              ACE_TCHAR *argv[])
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -195,7 +195,7 @@ Sender::init (int argc,
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
                        "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       this->filename_.c_str () ),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
@@ -232,7 +232,7 @@ Sender::init (int argc,
                                     "IN",
                                     "USER_DEFINED",
                                     "",
-                                    this->protocol_.c_str (),
+                                    ACE_TEXT_ALWAYS_CHAR (this->protocol_.c_str ()),
                                     &addr);
 
   ACE_INET_Addr peer_addr;
@@ -417,8 +417,7 @@ Sender::pace_data (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 7bdeb7d7b21..a64de401230 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -62,7 +62,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR *argv[]);
   // Method to initialize the various data components.
 
   int pace_data (void);
@@ -72,7 +72,7 @@ public:
   // Set the protocol object corresponding to the transport protocol chosen.
 
 private:
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Method to parse the command line arguments.
 
   int bind_to_receiver (void);
@@ -93,7 +93,7 @@ private:
   int frame_count_;
   // Number of frames sent.
 
-  ACE_CString filename_;
+  ACE_TString filename_;
   // File from which data is read.
 
   TAO_Naming_Client naming_client_;
@@ -102,7 +102,7 @@ private:
   FILE *input_file_;
   // File handle of the file read from.
 
-  ACE_CString protocol_;
+  ACE_TString protocol_;
   // Selected protocol - default is UDP
 
   double frame_rate_;