diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-03 19:02:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-03 19:02:19 +0000 |
| commit | 64f11bfe76883ccd61074d061f8925c679d3d961 (patch) | |
| tree | d56aba5c7dba0f2f75c8949d22955a7e7ff60418 /CIAO | |
| parent | 5923433ddfe646b49ab9c6ed0ee81f25d476b088 (diff) | |
| download | ATCD-64f11bfe76883ccd61074d061f8925c679d3d961.tar.gz | |
Wed Jan 3 07:01:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp | 4 | ||||
| -rw-r--r-- | CIAO/DAnCE/RepositoryManager/URL_Parser.cpp | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 4cc41384007..9d183252ebc 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 3 07:01:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/RepositoryManager/RepositoryManager.cpp: + Fixed conversion warnings + + * DAnCE/RepositoryManager/URL_Parser.cpp: + Initialise pointer with 0 + Wed Jan 3 16:18:36 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp index 46a5c009e57..7d170ad42d3 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp @@ -34,10 +34,10 @@ namespace CIAO const char * RMior = "RepositoryManagerDaemon.ior"; // Name of RepoMan - char * repoman_name_ = "RepositoryManager"; + const char * repoman_name_ = "RepositoryManager"; //Name service of the RM - char * RMname_service = "RepositoryManager"; + const char * RMname_service = "RepositoryManager"; /// Default number of worker threads to run in the multi-threaded RM static unsigned int nthreads = 3; diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp index aa346504a20..25ddcc9fa3c 100644 --- a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp +++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp @@ -43,7 +43,7 @@ URL_Parser::URL_Parser (void) bool URL_Parser::parseURL (char* url) { - char* ptr; + char* ptr = 0; bool success = true; ptr = ACE_OS::strstr (url, "http://"); if (ptr) @@ -84,7 +84,6 @@ bool URL_Parser::parseURL (char* url) void URL_Parser::Error (void) { ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n")); - } |