diff options
Diffstat (limited to 'TAO/utils/nslist/nsdel.cpp')
| -rw-r--r-- | TAO/utils/nslist/nsdel.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp index 9905c6b40f7..0d913af8c7f 100644 --- a/TAO/utils/nslist/nsdel.cpp +++ b/TAO/utils/nslist/nsdel.cpp @@ -17,7 +17,7 @@ // // ================================================================ -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" @@ -26,14 +26,12 @@ CORBA::ORB_var orb; int showIOR = 0; int showNSonly = 0; -const char* USAGE = "Usage: %s [ --name <name> ] [--destroy]\n"; int main (int argc, char *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; int i; - int destroy_after_unbind = 0; ACE_TRY { CORBA::ORB_var orb = @@ -57,13 +55,10 @@ main (int argc, char *argv[]) argv++; name = *argv; } - else if (ACE_OS::strcmp (*argv, "--destroy") == 0) - { - destroy_after_unbind = 1; - } else if (ACE_OS::strncmp(*argv, "--", 2) == 0) { - ACE_DEBUG ((LM_DEBUG, USAGE, pname)); + ACE_DEBUG ((LM_DEBUG, + "Usage: %s [ --name <name> ]\n", pname)); return 1; } argc--; @@ -72,7 +67,8 @@ main (int argc, char *argv[]) if (name == 0) { - ACE_DEBUG ((LM_DEBUG, USAGE, pname)); + ACE_DEBUG ((LM_DEBUG, + "Usage: %s [ --name <name> ]\n", pname)); return 1; } // make a copy @@ -139,19 +135,7 @@ main (int argc, char *argv[]) the_name[ntoks - 1].id = CORBA::string_dup (lastname); if (kind != 0) the_name[ntoks - 1].kind = CORBA::string_dup (kind); - - // This needs to be bounded by a try/catch - CORBA::Object_var the_context = root_nc->resolve (the_name ACE_ENV_ARG_PARAMETER); root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER ); - - if (destroy_after_unbind) - { - CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (the_context.in () ACE_ENV_ARG_PARAMETER); - if (! CORBA::is_nil(nc.in())) - nc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - } - ACE_TRY_CHECK; } ACE_CATCHANY |