ChangeLogTag:Tue Nov 4 04:55:40 UTC 2003 Don Hinton <dhinton@dresystems.com>

3 files changed, 24 insertions, 20 deletions

diff --git a/TAO/utils/IOR-parser/ior-handler.cpp b/TAO/utils/IOR-parser/ior-handler.cpp
index 288fa63e2d2..2c2ad934798 100644
--- a/TAO/utils/IOR-parser/ior-handler.cpp
+++ b/TAO/utils/IOR-parser/ior-handler.cpp
@@ -2,6 +2,9 @@
 
 #include "ior-handler.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 
 IorHandler::IorHandler (void)
 {
@@ -556,7 +559,7 @@ IorHandler::getIdlInterface (char *typeId, int *validTypeId)
       return ((char *)typeId);
     }
 
-  char *readStart = strchr(typeId, ':');
+  char *readStart = ACE_OS::strchr(typeId, ':');
 
   if (readStart == NULL)
     {
@@ -566,7 +569,7 @@ IorHandler::getIdlInterface (char *typeId, int *validTypeId)
     }
 
 
-  char *readEnd = strrchr (typeId, ':');
+  char *readEnd = ACE_OS::strrchr (typeId, ':');
 
   if (readEnd == NULL)
     {
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index 27cf959a964..ae248e0ad4a 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
       int rebind = 0;
       while (argc > 0)
         {
-          if (strcmp (*argv, "--ior") == 0)
+          if (ACE_OS::strcmp (*argv, "--ior") == 0)
             {
               if (argc == 1)
                 {
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
               argv++;
               ior = *argv;
             }
-          else if (strcmp (*argv, "--name") == 0)
+          else if (ACE_OS::strcmp (*argv, "--name") == 0)
             {
               if (argc == 1)
                 {
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
               argv++;
               name = *argv;
             }
-          else if (strcmp (*argv, "--rebind") == 0)
+          else if (ACE_OS::strcmp (*argv, "--rebind") == 0)
             {
               rebind = 1;
             }
-          else if (strncmp (*argv, "--", 2) == 0)
+          else if (ACE_OS::strncmp (*argv, "--", 2) == 0)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "Usage: %s --name <name> "
@@ -106,12 +106,12 @@ main (int argc, char *argv[])
         }
       //printf (" make a copy\n");
       char buf[BUFSIZ];
-      strcpy (buf, name);
+      ACE_OS::strcpy (buf, name);
       char *bp = &buf[0];
       char *cp = 0;
       int ntoks = 0;
       char *toks[20];
-      while ((cp = strtok (bp, "/")) != 0)
+      while ((cp = ACE_OS::strtok (bp, "/")) != 0)
 	{
           toks[ntoks] = cp;
           ntoks++;
@@ -122,9 +122,9 @@ main (int argc, char *argv[])
 
       // now assign name = toks[ntoks]
       char lastname[BUFSIZ];
-      strcpy (lastname, toks[ntoks-1]);
+      ACE_OS::strcpy (lastname, toks[ntoks-1]);
       // search for '.' in name; if exists then the part after '.' is the kind
-      char *kind = strchr (lastname, '.');
+      char *kind = ACE_OS::strchr (lastname, '.');
       if (kind != 0)
 	{
           *kind = 0;
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 8ee7b243193..a2c12e3b0f4 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -19,6 +19,7 @@
 
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
 
 CORBA::ORB_var orb;
 int showIOR = 0;
@@ -41,7 +42,7 @@ main (int argc, char *argv[])
 
       while (argc > 0)
         {
-          if (strcmp (*argv, "--name") == 0)
+          if (ACE_OS::strcmp (*argv, "--name") == 0)
             {
               if (argc == 1)
                 {
@@ -53,7 +54,7 @@ main (int argc, char *argv[])
               argv++;
               name = *argv;
             }
-          else if (strncmp(*argv, "--", 2) == 0)
+          else if (ACE_OS::strncmp(*argv, "--", 2) == 0)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "Usage: %s [ --name <name> ]\n", pname));
@@ -72,13 +73,13 @@ main (int argc, char *argv[])
         // make a copy
 
         char buf[BUFSIZ];
-        strcpy (buf, name);
+        ACE_OS::strcpy (buf, name);
         char *bp = &buf[0];
         char *cp = 0;
         int ntoks = 0;
         char *toks[20];
 
-        while ((cp = strtok (bp, "/")) != 0)
+        while ((cp = ACE_OS::strtok (bp, "/")) != 0)
           {
             toks[ntoks] = cp;
             ntoks++;
@@ -91,24 +92,24 @@ main (int argc, char *argv[])
           }
 
         for (i=0; i<ntoks; i++)
-          printf ("%s\n", toks[i]);
+          ACE_OS::printf ("%s\n", toks[i]);
 
         // now assign name = toks[ntoks]
         char lastname[BUFSIZ];
-        strcpy (lastname, toks[ntoks - 1]);
+        ACE_OS::strcpy (lastname, toks[ntoks - 1]);
 
         // search for '.' in name; if exists then the part after '.' is the kind
-        char *kind = strchr (lastname, '.');
+        char *kind = ACE_OS::strchr (lastname, '.');
 
         if (kind != 0)
           {
             *kind = 0;
             kind++;
-            printf ("name='%s'\n", lastname);
-            printf ( "kind='%s'\n" , kind );
+            ACE_OS::printf ("name='%s'\n", lastname);
+            ACE_OS::printf ( "kind='%s'\n" , kind );
           }
         else
-          printf ("name=%s\n", lastname );
+          ACE_OS::printf ("name=%s\n", lastname );
 
       CORBA::Object_var nc_obj =
         orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);