diff options
Diffstat (limited to 'modules/CIAO/DAnCE/RepositoryManager')
7 files changed, 111 insertions, 111 deletions
diff --git a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp index a6e0399fdb9..96dead11bb0 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -56,9 +56,9 @@ namespace { static const char* PC_EXTENSION = ".epc"; - static const char *RM_RECORD_FILE = "RM_record"; - static const char *RM_RECORD_NAME_SECTION = "Names"; - static const char *RM_RECORD_UUID_SECTION = "UUIDs"; + static const ACE_TCHAR *RM_RECORD_FILE = ACE_TEXT("RM_record"); + static const ACE_TCHAR *RM_RECORD_NAME_SECTION = ACE_TEXT("Names"); + static const ACE_TCHAR *RM_RECORD_UUID_SECTION = ACE_TEXT("UUIDs"); } namespace DAnCE @@ -70,7 +70,7 @@ namespace DAnCE //----------------------------------------------------------------- RepositoryManagerDaemon_i::RepositoryManagerDaemon_i - (CORBA::ORB_ptr the_orb, const char* server, const char* install_dir) + (CORBA::ORB_ptr the_orb, const ACE_TCHAR* server, const ACE_TCHAR* install_dir) : the_orb_ (CORBA::ORB::_duplicate (the_orb)), install_root_ (""), HTTP_server_ ("http://"), diff --git a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h index e7b3a9164a1..051c6577514 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h +++ b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h @@ -57,8 +57,8 @@ namespace DAnCE public: /// Constructor RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb, - const ACE_TCHAR* server = "localhost:5432", - const ACE_TCHAR* install_dir = "RepositoryManager"); + const ACE_TCHAR* server = ACE_TEXT("localhost:5432"), + const ACE_TCHAR* install_dir = ACE_TEXT("RepositoryManager")); /// Destructor virtual ~RepositoryManagerDaemon_i (void); diff --git a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp index 31d87faf550..a8fcdf872ab 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp @@ -60,23 +60,23 @@ namespace DAnCE try { - DANCE_DEBUG ((LM_INFO, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "Spawning thread %u for the ORB.\n", thread_id)); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("Spawning thread %u for the ORB.\n"), thread_id)); this->orb_->run (); - DANCE_DEBUG ((LM_INFO, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "ORB event loop for thread %u completed successfully.\n", thread_id)); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("ORB event loop for thread %u completed successfully.\n"), thread_id)); } - catch (CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "Caught CORBA exception from ORB event loop for thread %u: %s\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("Caught CORBA exception from ORB event loop for thread %u: %C\n"), thread_id, ex._info ().c_str ())); return -1; } catch (...) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE::Repository_Manager::Worker::svc - " - "Caught unknown C++ exception from ORB event loop for thread %u\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ") + ACE_TEXT("Caught unknown C++ exception from ORB event loop for thread %u\n"), thread_id)); return -1; } @@ -169,42 +169,42 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) switch (c) { case 'd': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Binding to provided Domain Naming Context: '%s'\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Binding to provided Domain Naming Context: '%s'\n"), get_opts.opt_arg ())); this->options_.domain_nc_ = get_opts.opt_arg (); break; case 'f': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Output filename for IOR is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Output filename for IOR is %s\n"), get_opts.opt_arg ())); this->options_.ior_file_ = get_opts.opt_arg (); break; case 't': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Number of threads is %C\n", get_opts.opt_arg ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Number of threads is %s\n"), get_opts.opt_arg ())); this->options_.threads_ = (ACE_OS::atoi (get_opts.opt_arg ())); break; case 'p': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Package directory is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Package directory is %s\n"), get_opts.opt_arg ())); this->options_.package_dir_ = get_opts.opt_arg (); break; case 'n': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Name is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Name is %s\n"), get_opts.opt_arg ())); this->options_.name_ = get_opts.opt_arg (); break; case 's': - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Server address is %C\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Server address is %s\n"), get_opts.opt_arg ())); this->options_.server_address_ = get_opts.opt_arg (); break; @@ -212,54 +212,54 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) case 0: if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("spawn-http")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Found option to spawn in-process HTTP server\n")); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Found option to spawn in-process HTTP server\n"))); this->options_.spawn_http_ = true; } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-port")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server port\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server port\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_port_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-threads")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP number of threads\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP number of threads\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_threads_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-threading")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server threading model\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server threading model\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_threading_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-io")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server IO strategy\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server IO strategy\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_io_ = get_opts.opt_arg (); } else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-caching")) == 0) { - DANCE_DEBUG ((LM_DEBUG, DLINFO "Repository_Manager_Module::parse_args - " - "Using %C as the spawned HTTP server caching strategy\n", + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Using %s as the spawned HTTP server caching strategy\n"), get_opts.opt_arg ())); this->options_.spawn_http_ = true; this->options_.http_caching_ = get_opts.opt_arg (); } else { - DANCE_ERROR ((LM_ERROR, DLINFO "Repository_Manager_Module::parse_args - " - "ERROR: unknown long option %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("ERROR: unknown long option %s\n"), get_opts.long_option ())); } @@ -279,8 +279,8 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) if (this->options_.server_address_ == 0) { - DANCE_ERROR ((LM_ERROR, DLINFO "Repository_Manager_Module::parse_args - " - "Must provider server address using --server-address option.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ") + ACE_TEXT("Must provider server address using --server-address option.\n"))); return false; } @@ -298,8 +298,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, { if (CORBA::is_nil(orb)) { - DANCE_ERROR((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Attempted to create Repository Manager with a nil orb.\n")); + DANCE_ERROR((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Attempted to create Repository Manager with a nil orb.\n"))); return CORBA::Object::_nil(); } else @@ -309,8 +309,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0) { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Resetting NM's orb.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Resetting NM's orb.\n"))); this->orb_ = CORBA::ORB::_duplicate (orb); this->domain_nc_ = CosNaming::NamingContext::_nil(); } @@ -329,30 +329,30 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, { try { - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Resolving DomainNC.\n")); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Resolving DomainNC.\n"))); CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_); if (!CORBA::is_nil (domain_obj.in ())) { this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in()); if (CORBA::is_nil (this->domain_nc_.in ())) { - DANCE_ERROR ((LM_ERROR,DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Narrow to NamingContext return nil for DomainNC.\n")); + DANCE_ERROR ((LM_ERROR,DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n"))); return CORBA::Object::_nil (); } } } - catch (CORBA::Exception&) + catch (const CORBA::Exception&) { - DANCE_DEBUG ((LM_WARNING, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "DomainNC context not found!\n")); + DANCE_DEBUG ((LM_WARNING, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("DomainNC context not found!\n"))); } } - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Initializing the IOR Table\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Initializing the IOR Table\n"))); // Initialize IOR table CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable"); @@ -360,8 +360,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, if (CORBA::is_nil (adapter.in ())) { - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Unable to RIR the IORTable.\n")); + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Unable to RIR the IORTable.\n"))); return CORBA::Object::_nil (); } @@ -402,8 +402,8 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, ns_name = "RepositoryManager"; else ns_name = this->options_.name_; - DANCE_DEBUG((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Registering NM in NC as \"%C\".\n", ns_name.c_str ())); + DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Registering NM in NC as \"%C\".\n"), ns_name.c_str ())); CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (ns_name.c_str ()); @@ -414,11 +414,11 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, // Writing ior to file if (0 != this->options_.ior_file_) { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Writing RM IOR %C to file %C.\n", this->options_.ior_file_, ior.in ())); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Writing RM IOR %C to file %C.\n"), this->options_.ior_file_, ior.in ())); if (!DAnCE::Repository_Manager::write_IOR (this->options_.ior_file_, ior.in ())) - DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "Error: Unable to write IOR to file %C\n", + DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("Error: Unable to write IOR to file %C\n"), this->options_.ior_file_)); } @@ -427,11 +427,11 @@ DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb, mgr->activate (); // Finishing Deployment part - DANCE_DEBUG ((LM_NOTICE, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "DAnCE_RepositoryManager is running...\n")); + DANCE_DEBUG ((LM_NOTICE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("DAnCE_RepositoryManager is running...\n"))); - DANCE_DEBUG ((LM_DEBUG, DLINFO "DAnCE_RepositoryManager_Module::create_object - " - "RepositoryManager IOR: %s\n", ior.in ())); + DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ") + ACE_TEXT("RepositoryManager IOR: %C\n"), ior.in ())); return nm_obj._retn (); } @@ -447,14 +447,14 @@ DAnCE_RepositoryManager_Module::create_poas (void) { DANCE_TRACE("DAnCE_Repository_Manager_Module::create_poas"); // Get reference to Root POA. - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "Resolving root POA\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Resolving root POA\n"))); CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA"); this->root_poa_ = PortableServer::POA::_narrow (obj.in ()); - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "Obtaining the POAManager\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Obtaining the POAManager\n"))); PortableServer::POAManager_var mgr = this->root_poa_->the_POAManager (); TAO::Utils::PolicyList_Destroyer policies (2); @@ -462,9 +462,9 @@ DAnCE_RepositoryManager_Module::create_poas (void) try { - DANCE_DEBUG ((LM_TRACE, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "DAnCE_RepositoryManager_Module::create_poas - " - "Creating the \"Repository\" POA.\n")); + DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Creating the \"Repository\" POA.\n"))); policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID); policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT); @@ -474,8 +474,8 @@ DAnCE_RepositoryManager_Module::create_poas (void) } catch (const PortableServer::POA::AdapterAlreadyExists &) { - DANCE_DEBUG ((LM_INFO, DLINFO "DAnCE_RepositoryManager_Module::create_poas - " - "Using exiswting \"Repository\" POA\n")); + DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ") + ACE_TEXT("Using existing \"Repository\" POA\n"))); this->rm_poa_ = this->root_poa_->find_POA ("Repository", 0); } } diff --git a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h index 21804fec10a..18a149e5e21 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h +++ b/modules/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h @@ -75,11 +75,11 @@ class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module package_dir_ (ACE_TEXT("RepositoryManager_Packages")), server_address_ (0), spawn_http_ (false), - http_port_ ("5432"), - http_threads_ ("1"), - http_threading_ ("POOL"), - http_io_ ("SYNCH"), - http_caching_ ("NO_CACHE") + http_port_ (ACE_TEXT("5432")), + http_threads_ (ACE_TEXT("1")), + http_threading_ (ACE_TEXT("POOL")), + http_io_ (ACE_TEXT("SYNCH")), + http_caching_ (ACE_TEXT("NO_CACHE")) { } }; @@ -96,7 +96,7 @@ class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module int argc, ACE_TCHAR *argv []); - virtual const ACE_TCHAR * usage (void); + virtual const char * usage (void); virtual bool parse_args (int argc, ACE_TCHAR *argv []); diff --git a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp index 37187ebff61..47cf4fbb039 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp @@ -38,20 +38,20 @@ URL_Parser::parse_args (int argc, ACE_TCHAR *argv[]) } URL_Parser::URL_Parser (void) - : hostname_ (ACE::strnew ("127.0.0.1")), + : hostname_ (ACE::strnew (ACE_TEXT("127.0.0.1"))), port_ (ACE_DEFAULT_HTTP_SERVER_PORT), filename_ (0), debug_ (false) { } -bool URL_Parser::parseURL (char* url) +bool URL_Parser::parseURL (ACE_TCHAR* url) { - char* ptr = 0; + ACE_TCHAR* ptr = 0; bool success = true; - ptr = ACE_OS::strstr (url, "http://"); + ptr = ACE_OS::strstr (url, ACE_TEXT("http://")); if (ptr) - url += ACE_OS::strlen ("http://"); + url += ACE_OS::strlen (ACE_TEXT("http://")); if (url[0] == '/') { diff --git a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h index 0dfef0262ad..16805c390b7 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h +++ b/modules/CIAO/DAnCE/RepositoryManager/URL_Parser.h @@ -37,7 +37,7 @@ public: bool parse_args (int argc, ACE_TCHAR *argv[]); /// Return false on failure - bool parseURL (char* url); + bool parseURL (ACE_TCHAR* url); void Error (void); diff --git a/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp index 41a247cb717..d5f130b828f 100644 --- a/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp +++ b/modules/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp @@ -72,16 +72,16 @@ int ZIP_Wrapper::file_list_info (char* zip_name, /* If zipfile could not be opened still, return */ if (uf==0) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening" - " %s or %s.zip using unzOpen\n"), zip_name, zip_name)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening") + ACE_TEXT(" %s or %s.zip using unzOpen\n"), zip_name, zip_name)); return 1; } unz_global_info gi; /* get information about all the files in zip file*/ int err = unzGetGlobalInfo(uf, &gi); if (err!=UNZ_OK) - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying" - " to get global information about zipfile\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying") + ACE_TEXT(" to get global information about zipfile\n"), err)); /* gi.number_entry corresponds to the number of directory entries in the zip file */ for (uLong i=0;i<gi.number_entry;i++) @@ -93,9 +93,9 @@ int ZIP_Wrapper::file_list_info (char* zip_name, sizeof(filename_inzip), 0, 0, 0, 0); if (err!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" - " while trying to get information" - " about current file\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed") + ACE_TEXT(" while trying to get information") + ACE_TEXT(" about current file\n"), err)); break; } ZIP_File_Info* next = 0; @@ -109,8 +109,8 @@ int ZIP_Wrapper::file_list_info (char* zip_name, if (err!=UNZ_OK) { ACE_DEBUG((LM_DEBUG, - ACE_TEXT(" unzGoToNextFile failed" - " while trying to go to next file\n"), + ACE_TEXT(" unzGoToNextFile failed") + ACE_TEXT(" while trying to go to next file\n"), err)); break; } @@ -140,8 +140,8 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename, int k=unzOpenCurrentFile(uf); if (k!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current" - " file using unzOpenCurrentFile"))); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current") + ACE_TEXT(" file using unzOpenCurrentFile"))); return false; } else @@ -187,8 +187,8 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) uf = unzOpen(zip_archive); if (uf==0) { - ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the" - " zipfile\n"))); + ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the") + ACE_TEXT(" zipfile\n"))); return false; } //get the name of the archive @@ -212,15 +212,15 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) int err = unzGetGlobalInfo(uf, &gi); if (err!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global" - " information about zipfile\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global") + ACE_TEXT(" information about zipfile\n"), err)); return false; } err =unzGoToFirstFile(uf); if (err!=UNZ_OK) { ACE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in" - " unzGoToFirstFile\n"), err)); + ACE_TEXT(" unzGoToFirstFile\n")), err)); return false; } /* read each entry of zip file, create directory structure if it is @@ -234,9 +234,9 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) sizeof(filename_inzip), 0, 0, 0, 0); if (err!=UNZ_OK) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed" - " while trying to get information" - " about currentfile\n"), err)); + ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed") + ACE_TEXT(" while trying to get information") + ACE_TEXT(" about currentfile\n"), err)); break; } int direc = checkdir(filename_inzip); @@ -256,9 +256,9 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose) err = unzGoToNextFile(uf); if (err!=UNZ_OK) { - ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed" - " while trying to go to" - " nextfile\n"), err)); + ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed") + ACE_TEXT(" while trying to go to") + ACE_TEXT(" nextfile\n"), err)); break; } } |