diff options
author | Phil Mesnier <mesnierp@ociweb.com> | 2015-11-20 14:06:33 -0600 |
---|---|---|
committer | Phil Mesnier <mesnierp@ociweb.com> | 2015-11-20 14:06:33 -0600 |
commit | 2f093aa99c866dbbb63708a63539739913b55b9e (patch) | |
tree | 1af33efe6b63f23b7c2e71edfd35b6eab272116e /TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | |
parent | 19e9ff24881b62a1fe334c47f6da72316f20e8da (diff) | |
download | ATCD-2f093aa99c866dbbb63708a63539739913b55b9e.tar.gz |
Fix the order of the command line arguments to be consistent with the rest of the tao_imr commands.
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp')
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 3e48efd1e3c..c5eaa18069f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -612,7 +612,7 @@ TAO_IMR_Op_Remove::print_usage (void) { ORBSVCS_ERROR ((LM_ERROR, "Removes a server entry\n" "\n" - "Usage: tao_imr [options] remove [-f [-s <signum>]] <name>\n" + "Usage: tao_imr [options] remove <name> [-f [-s <signum>]]\n" " where [options] are ORB options\n" " -f forces shutdown or kill of a running server" " -s specifies a signal for killing the server, if it is 0, a shutdown will be used" @@ -631,10 +631,11 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) } this->force_ = false; this->signum_ = 0; - int server_arg = 1; + // Skip both the program name and the "remove" command ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hfs:")); + this->server_name_ = ACE_TEXT_ALWAYS_CHAR(argv[1]); int c; while ((c = get_opts ()) != -1) @@ -646,11 +647,9 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) return -1; case 'f': this->force_ = true; - ++server_arg; break; case 's': this->signum_ = ACE_OS::strtol (get_opts.opt_arg (), 0, 10); - server_arg += 2; break; default: ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); @@ -659,7 +658,6 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) } } - this->server_name_ = ACE_TEXT_ALWAYS_CHAR(argv[server_arg]); return 0; } |