diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-26 12:53:24 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-26 12:53:24 +0000 |
commit | c2324c5ca3701584652b6898f3fc7a94ee19f266 (patch) | |
tree | ab92be41180379506e43ee21a9b338f8c9b9b1dc | |
parent | 479ecfacaf63cfa397eff3792e0f6527c39c9674 (diff) | |
download | ATCD-c2324c5ca3701584652b6898f3fc7a94ee19f266.tar.gz |
ChangeLogTag: Tue Jul 26 12:13:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp b/TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp index 3b3361bd4c0..696bcb42e6d 100644 --- a/TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp +++ b/TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp @@ -29,8 +29,8 @@ CORBA::Octet* read_from_disk ( ); int write_to_disk ( - const char* full_path, - const CORBA::Octet* buffer, + const char* full_path, + const CORBA::Octet* buffer, size_t length ); ///======================================================================================== @@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_NEW_ENV { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -61,7 +61,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (rm.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire new_RepositoryManagerDaemon's objref\n"), -1); } @@ -69,14 +69,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Options* options = Options::instance (); options->parse_args (argc, argv); - + if (options->shutdown_) { rm->shutdown (); } else if (options->install_) { - size_t length = 0; + size_t length = 0; CORBA::Octet* buffer = read_from_disk (options->local_path_.c_str (), length); Deployment::Package* the_package = new Deployment::Package ( @@ -84,13 +84,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) length, //length of the sequence buffer, //data to be stored within the sequence true //take ownership of the data - ); + ); try { rm->installPackage (options->package_.c_str (), *the_package, false); } - catch (CORBA::Exception &ex) + catch (CORBA::Exception &) { cout << "\nPackage is already in the repository!\n"; } @@ -102,7 +102,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) cout << "The package was found!" << endl; cout << "Its size is " << package_back->length () << endl; } - catch (CORBA::Exception &ex) + catch (CORBA::Exception &) { cout << "\nNo such package!" << endl; } @@ -114,7 +114,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) rm->deletePackage (options->package_.c_str ()); cout << options->package_.c_str () << " deleted" << endl; } - catch (CORBA::Exception &ex) + catch (CORBA::Exception &) { cout << "\nNo such package!" << endl; } @@ -131,11 +131,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - Deployment::Implementation_var impl = rm->findImplementationByName (options->artifact_.c_str (), + Deployment::Implementation_var impl = rm->findImplementationByName (options->artifact_.c_str (), options->package_.c_str()); - write_to_disk (impl->name, impl->the_implementation.get_buffer (),impl->the_implementation.length ()); + write_to_disk (impl->name, impl->the_implementation.get_buffer (),impl->the_implementation.length ()); } - catch (CORBA::Exception &ex) + catch (CORBA::Exception &) { cout << "\nNo such implementation artifact in that package!" << endl; } |