Wed Oct 22 17:47:54 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

11 files changed, 32 insertions, 17 deletions

diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
index a4afca3e4ed..f662a479458 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
@@ -46,7 +46,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     if (CORBA::is_nil(peer.in()))
       {
         std::cerr << "Could not initialize peer object reference" << std::endl;
-        exit (1);
+        ACE_OS::exit (1);
       }
 
     // create either a synchronous or AMH_based servant depending on command
diff --git a/TAO/DevGuideExamples/ChangeLog b/TAO/DevGuideExamples/ChangeLog
index 91abec09848..5bf272d1a8b 100644
--- a/TAO/DevGuideExamples/ChangeLog
+++ b/TAO/DevGuideExamples/ChangeLog
@@ -1,3 +1,18 @@
+Wed Oct 22 17:47:54 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * AMH_AMI/middle_server.cpp:
+        * EventServices/RTEC_Federated/EchoEventConsumerMain.cpp:
+        * EventServices/RTEC_Federated/EchoEventSupplierMain.cpp:
+        * EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
+        * EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * Messaging/AMIcallback/MessengerServer.cpp:
+        * NamingService/Naming_Server/MessengerTask.cpp:
+        * NamingService/Naming_Server/NamingTask.cpp:
+        * PortableInterceptors/IOR/Messenger_i.cpp:
+        * PortableInterceptors/SimpleCodec/Messenger_i.cpp:
+
+          Fix fuzz errors by using ACE_OS:: functions instead of the naked/raw ones.
+
 Wed Oct 22 16:45:07 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * ValueTypes/Notify/Event.idl:
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
index f54a11177b4..a9ee13d6fbd 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
@@ -26,7 +26,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     const char* ecname = "EventService";
     for (int i = 0; argv[i] != 0; i++) {
-      if (strcmp(argv[i], "-ecname") == 0) {
+      if (ACE_OS::strcmp(argv[i], "-ecname") == 0) {
         if (argv[i+1] != 0) {
           ecname = argv[i+1];
         } else {
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
index 1d85aed8b28..cfd9ff0b61e 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
@@ -44,7 +44,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     const char* remote_ecname = 0;
     const char* iorfile = 0;
     for (int i = 0; argv[i] != 0; i++) {
-      if (strcmp(argv[i], "-ecname") == 0) {
+      if (ACE_OS::strcmp(argv[i], "-ecname") == 0) {
         if (argv[i+1] != 0) {
           i++;
           ecname = argv[i];
@@ -52,7 +52,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           std::cerr << "Missing Event channel name" << std::endl;
         }
       }
-      if (strcmp(argv[i], "-gateway") == 0) {
+      if (ACE_OS::strcmp(argv[i], "-gateway") == 0) {
         if (argv[i+1] != 0) {
           i++;
           remote_ecname = argv[i];
@@ -60,7 +60,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           std::cerr << "Missing Event channel name" << std::endl;
         }
       }
-      if (strcmp(argv[i], "-iorfile") == 0) {
+      if (ACE_OS::strcmp(argv[i], "-iorfile") == 0) {
         if (argv[i+1] != 0) {
           i++;
           iorfile = argv[i];
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 6f1b8ab44e9..71511628a2e 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -26,7 +26,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     const char* ecname = "EventService";
     for (int i = 0; argv[i] != 0; i++) {
-      if (strcmp(argv[i], "-ecname") == 0) {
+      if (ACE_OS::strcmp(argv[i], "-ecname") == 0) {
         if (argv[i+1] != 0) {
           ecname = argv[i+1];
         } else {
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 72dde0ef126..7f15d38e3ca 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -48,40 +48,40 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     int mcast = 1;
 
     for (int i = 0; argv[i] != 0; i++) {
-      if (strcmp(argv[i], "-ecname") == 0) {
+      if (ACE_OS::strcmp(argv[i], "-ecname") == 0) {
         if (argv[i+1] != 0) {
           i++;
           ecname = argv[i];
         } else {
           std::cerr << "Missing Event channel name" << std::endl;
         }
-      } else if (strcmp(argv[i], "-address") == 0) {
+      } else if (ACE_OS::strcmp(argv[i], "-address") == 0) {
         if (argv[i+1] != 0) {
           i++;
           address = argv[i];
         } else {
           std::cerr << "Missing address" << std::endl;
         }
-      } else if (strcmp(argv[i], "-port") == 0) {
+      } else if (ACE_OS::strcmp(argv[i], "-port") == 0) {
         if (argv[i+1] != 0) {
           i++;
           port = ACE_OS::atoi(argv[i]);
         } else {
           std::cerr << "Missing port" << std::endl;
         }
-      } else if (strcmp(argv[i], "-listenport") == 0) {
+      } else if (ACE_OS::strcmp(argv[i], "-listenport") == 0) {
         if (argv[i+1] != 0) {
           i++;
           listenport = ACE_OS::atoi(argv[i]);
         } else {
           std::cerr << "Missing port" << std::endl;
         }
-      } else if (strcmp(argv[i], "-iorfile") == 0) {
+      } else if (ACE_OS::strcmp(argv[i], "-iorfile") == 0) {
         if (argv[i+1] != 0) {
           i++;
           iorfile = argv[i];
         }
-      } else if (strcmp(argv[i], "-udp") == 0) {
+      } else if (ACE_OS::strcmp(argv[i], "-udp") == 0) {
         mcast = 0;
       }
     }
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
index 131d67d81f3..faef3a6dc2c 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
@@ -27,7 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
       }
       else
       {
-        seconds_to_wait = atoi(argv[1]);
+        seconds_to_wait = ACE_OS::atoi(argv[1]);
         std::cout << "Messenger_i::send_message() will wait "
           << seconds_to_wait << " seconds" << std::endl;
       }
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
index 43dd52645d3..030214872d7 100644
--- a/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
+++ b/TAO/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
@@ -16,7 +16,7 @@ MessengerTask::MessengerTask()
 void MessengerTask::end()
 {
   orb_->shutdown(0);
-  wait();
+  this->wait();
 }
 
 int MessengerTask::svc()
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
index 2cd9169e3af..8b404d78311 100644
--- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
+++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
@@ -24,7 +24,7 @@ void NamingTask::waitInit ()
 void NamingTask::end()
 {
   orb_->shutdown(0);
-  wait();
+  this->wait();
 }
 
 int NamingTask::svc()
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index d1fe8d4f790..1cdd6851662 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -22,7 +22,7 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       int argc = 1;
       char **argv = new char *[argc];
       argv[0] = new char[ACE_OS::strlen ("MessengerServer")];
-      strcpy (argv[0], "MessengerServer");
+      ACE_OS::strcpy (argv[0], "MessengerServer");
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index 71b1860bcd7..9b54a07e441 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -22,7 +22,7 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       int argc = 1;
       char **argv = new char *[argc];
       argv[0] = new char[ACE_OS::strlen ("MessengerServer")];
-      strcpy (argv[0], "MessengerServer");
+      ACE_OS::strcpy (argv[0], "MessengerServer");
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);