ChangeLogTag: Wed Jun 25 14:15:00 UTC 2008 Simon Massey <sma at prismtech dot com>

12 files changed, 55 insertions, 41 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7ce0755ab6d..a152a8b6207 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Wed Jun 25 14:15:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * tests/HandleExhaustion/client.cpp:
+        * tests/HandleExhaustion/server.cpp:
+        * tests/Bug_2424_Regression/client.cpp:
+        * tests/Bug_2549_Regression/test.cpp:
+        * tests/Multiple/client.cpp:
+        * tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp:
+        * tests/Smart_Proxies/Collocation/main.cpp:
+        * tests/Smart_Proxies/Collocation/Coll_Tester.h:
+        * tests/Smart_Proxies/Collocation/Coll_Tester.cpp:
+        * tests/Smart_Proxies/dtor/client.cpp:
+        * tests/Smart_Proxies/dtor/server.cpp:
+
+          Fix fuzz errors incorrect ACE_TMAIN/main use.
+
 Wed Jun 25 13:55:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
         * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp:
diff --git a/TAO/tests/Bug_2424_Regression/client.cpp b/TAO/tests/Bug_2424_Regression/client.cpp
index 4bca89b3009..10eebeb1eb9 100644
--- a/TAO/tests/Bug_2424_Regression/client.cpp
+++ b/TAO/tests/Bug_2424_Regression/client.cpp
@@ -2,7 +2,7 @@
 
 #include "OneLineCosNamingC.h"
 
-int main (int, char*[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/TAO/tests/Bug_2549_Regression/test.cpp b/TAO/tests/Bug_2549_Regression/test.cpp
index 68acdde0f3b..759c2d5edc9 100644
--- a/TAO/tests/Bug_2549_Regression/test.cpp
+++ b/TAO/tests/Bug_2549_Regression/test.cpp
@@ -2,7 +2,7 @@
 
 #include "testS.h"
 
-int main (int, char*[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp
index e974cd074ea..836f9c93de4 100644
--- a/TAO/tests/HandleExhaustion/client.cpp
+++ b/TAO/tests/HandleExhaustion/client.cpp
@@ -7,10 +7,10 @@
 ACE_RCSID(ConnectionSpinning,
           client, "$Id$")
 
-static const char *ior = "file://server.ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:x");
   int c;
@@ -36,7 +36,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       Test_var test = Test::_narrow(tmp.in ());
 
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index 0cc91ff5151..510783b0592 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -11,7 +11,7 @@
 ACE_RCSID (ConnectionSpinning,
            server, "$Id$")
 
-const char *ior_output_file = "server.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 
 class Test_i: public virtual POA_Test
 {
@@ -52,7 +52,7 @@ public:
     return 0;
   }
 
-  void leak (const char* file)
+  void leak (const ACE_TCHAR* file)
   {
     for (size_t i = 0; i < 0xffff; i++)
       {
@@ -81,7 +81,7 @@ private:
 };
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "o:");
   int c;
@@ -107,7 +107,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -170,8 +170,9 @@ main (int argc, char *argv[])
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s\n",
-                           ior_output_file),
+                           "Cannot open output file %s for writing IOR: %s\n",
+                           ior_output_file,
+                           ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
                            1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index d0050e5d8e3..64578b84adb 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -5,10 +5,10 @@
 
 ACE_RCSID (tests, client, "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:");
   int c;
@@ -33,7 +33,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -43,7 +43,7 @@ int main (int argc, char *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      CORBA::Object_var object = orb->string_to_object (ior);
+      CORBA::Object_var object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       if (CORBA::is_nil (object.in ()))
         {
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
index 74f91b2ccea..9371c089787 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
@@ -21,14 +21,14 @@ public:
 };
 
 
-int main(int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb1 =
-                    CORBA::ORB_init(argc, argv, "orb1");
+                    CORBA::ORB_init (argc, argv, "orb1");
       CORBA::ORB_var orb2 =
-                    CORBA::ORB_init(argc, argv, "orb2");
+                    CORBA::ORB_init (argc, argv, "orb2");
 
       CORBA::Object_var poaObj_var =
                     orb1->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index 6de51e5a705..e7ddda5bbf0 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -22,7 +22,7 @@ Collocation_Test::Collocation_Test (void)
 }
 
 int
-Collocation_Test::init (int argc, char *argv[])
+Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 {
   // Initialize the ORB.
   this->orb_ = CORBA::ORB_init (argc, argv);
@@ -74,10 +74,8 @@ Collocation_Test::init (int argc, char *argv[])
 }
 
 int
-Collocation_Test::parse_args (int argc, char *argv[])
+Collocation_Test::parse_args (int, ACE_TCHAR *[])
 {
-  ACE_UNUSED_ARG(argc);
-  ACE_UNUSED_ARG(argv);
   return 0;
 }
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index 7d502a7c8b6..96366bd6f15 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -28,10 +28,10 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  int init (int argc, char *argv[]);
+  int init (int argc, ACE_TCHAR *argv[]);
   // Initializing the Collocation_Test object.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the test specific arguments.
 
   int test_narrow (void);
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index 2b5dc93744b..7955d7a9770 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -5,7 +5,7 @@
 
 ACE_RCSID(Collocation, main, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Collocation_Test coll_test;
 
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 5090ad4ac06..49fd6a09238 100644
--- a/TAO/tests/Smart_Proxies/dtor/client.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/client.cpp
@@ -6,11 +6,11 @@
 #include "testC.h"
 #include "Smart_Proxy_Impl.h"
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 bool dtor_called;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "i:");
   int c;
@@ -19,7 +19,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'i':
-        ior = ACE_OS::strdup (get_opts.opt_arg ());
+        ior = get_opts.opt_arg ();
       break;
       case '?':
       default:
@@ -33,17 +33,16 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
   {
-    CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                          argv);
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
-    CORBA::Object_var obj = orb->string_to_object (ior);
+    CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
     // force a scope to see the destruction of the server object
     {
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index 30f5cb02a3f..fdef1cf19be 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -36,10 +36,10 @@ Test_i::shutdown (void)
   this->orb_->shutdown (0);
 }
 
-static const char *ior_output_file = 0;
+static const ACE_TCHAR *ior_output_file = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "o:");
   int c;
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = ACE_OS::strdup (get_opts.opt_arg ());
+        ior_output_file = get_opts.opt_arg ();
         break;
       case '?':
       default:
@@ -63,13 +63,12 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
   {
-    CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                          argv);
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
     if (parse_args (argc, argv) != 0)
       return 1;
@@ -104,8 +103,9 @@ int main (int argc, char* argv[])
 
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Cannot open output file for writing IOR: %s",
-                             ior_output_file),
+                             "Cannot open output file %s for writing IOR: %s",
+                             ior_output_file,
+                             ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
                             1);
 
         ACE_OS::fprintf (output_file, "%s", ior.in ());