.

9 files changed, 14 insertions, 20 deletions

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index b22a07be06f..3d20eaeed91 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -80,7 +80,7 @@ TAO_Naming_Service::parse_args (int argc,
 // Initialize the state of the TAO_Naming_Service object
 int
 TAO_Naming_Service::init (int argc,
-                          char* argv[])
+                          char *argv[])
 {
   int result;
   CORBA::ORB_var orb;
@@ -155,20 +155,17 @@ TAO_Naming_Service::~TAO_Naming_Service (void)
 int
 main (int argc, char* argv[])
 {
-  int init_result;
-
   TAO_Naming_Service naming_service;
 
-  init_result = naming_service.init (argc,argv);
+  int init_result = naming_service.init (argc, argv);
 
   if (init_result == -1)
-    return init_result;
+    return -1;
 
   TAO_TRY
     {
       naming_service.run (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
     }
   TAO_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index ecea3afc753..7d9a538e194 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -109,7 +109,6 @@ class TAO_ORBSVCS_Export TAO_Naming_Client
   //    <resolve>, etc. can be called on a <NameServer> object.
   //    This class is intended to simplify programs that want to play
   //    the role of a Naming Service clients.
-
 public:
   TAO_Naming_Client (void);
   // Default constructor.
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
index f23798a9194..9bbda873468 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
@@ -124,7 +124,7 @@ Server::Server (void)
 // Initializes the mpeg server
 int
 Server::init (int argc,
-              char **argv,
+              char *argv[],
               CORBA::Environment& env)
 {
   int result;
@@ -144,7 +144,7 @@ Server::init (int argc,
     this->orb_manager_.child_poa ();
 
   // Initialize the naming services
-  if (my_name_client_.init (orb, argc, argv) != 0)
+  if (my_name_client_.init (orb) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       " (%P|%t) Unable to initialize "
 		       "the TAO_Naming_Client. \n"),
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
index 9fcec5cc001..9520abf4045 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
@@ -62,7 +62,7 @@ Command_Handler::~Command_Handler (void)
 
 int
 Command_Handler::init (int argc,
-                       char **argv)
+                       char *argv[])
 {
   TAO_TRY
     {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 8b445d93a51..93a569fe5aa 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -140,9 +140,7 @@ CC_naming_service::init_naming_service (void)
   TAO_TRY
     {
       // Initialize the naming services
-      // Normally, init () would take argc and argv as arguments but
-      // in this situation, they can only be passed dummy values
-      if (my_name_client_.init (orb_.in (), 0, 0) != 0)
+      if (my_name_client_.init (orb_.in ()) != 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   " (%P|%t) Unable to initialize "
 			   "the TAO_Naming_Client. \n"),
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
index 79da6c1d1de..35a069f5781 100644
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
@@ -167,7 +167,7 @@ CosNaming_Client::list_contents (void)
 }
 
 int
-CosNaming_Client::init (int argc, char **argv)
+CosNaming_Client::init (int argc, char *argv[])
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -179,7 +179,7 @@ CosNaming_Client::init (int argc, char **argv)
       TAO_CHECK_ENV;
 
       // Initialize the naming services
-      if (my_name_client_.init (orb_, argc_, argv_) != 0)
+      if (my_name_client_.init (orb_) != 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   " (%P|%t) Unable to initialize "
 			   "the TAO_Naming_Client. \n"),
diff --git a/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp b/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
index 179b61566a7..761410ca5c7 100644
--- a/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
+++ b/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
@@ -22,7 +22,7 @@ Logger_Client::~Logger_Client (void)
 }
 
 int
-Logger_Client::init (int argc, char **argv)
+Logger_Client::init (int argc, char *argv[])
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -75,7 +75,7 @@ int
 Logger_Client::init_naming_service (CORBA::Environment &env)
 {
   // Initialize the naming services
-  if (my_name_client_.init (orb_.in (), argc_, argv_) != 0)
+  if (my_name_client_.init (orb_.in ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
                        "the TAO_Naming_Client. \n"),
diff --git a/TAO/orbsvcs/tests/Logger/client_i.cpp b/TAO/orbsvcs/tests/Logger/client_i.cpp
index 8cabae43099..02003a5f608 100644
--- a/TAO/orbsvcs/tests/Logger/client_i.cpp
+++ b/TAO/orbsvcs/tests/Logger/client_i.cpp
@@ -22,7 +22,7 @@ Logger_Client::~Logger_Client (void)
 }
 
 int
-Logger_Client::init (int argc, char **argv)
+Logger_Client::init (int argc, char *argv[])
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -75,7 +75,7 @@ int
 Logger_Client::init_naming_service (CORBA::Environment &env)
 {
   // Initialize the naming services
-  if (my_name_client_.init (orb_, argc_, argv_) != 0)
+  if (my_name_client_.init (orb_) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       " (%P|%t) Unable to initialize "
 		       "the TAO_Naming_Client. \n"),
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 6e77e941de8..3cbda4e23cc 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -343,7 +343,7 @@ main (int argc, char *argv[])
       
       // Initialize the naming services
       TAO_Naming_Client my_name_client;
-      if (my_name_client.init (orb.in (), argc, argv) != 0)
+      if (my_name_client.init (orb.in ()) != 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   " (%P|%t) Unable to initialize "
 			   "the TAO_Naming_Client. \n"),