diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-07 18:44:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-07 18:44:59 +0000 |
| commit | 5610268be8a366a6dc1aad09b4e23d46490b4d86 (patch) | |
| tree | ffc2fdcc0d7c9485e122939e6200e2e8dca0178c | |
| parent | 51f302fcda077a0bd2e2dea0bc73cbeb855116af (diff) | |
| download | ATCD-5610268be8a366a6dc1aad09b4e23d46490b4d86.tar.gz | |
Sun Jan 7 18:44:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp | 3 | ||||
| -rw-r--r-- | CIAO/DAnCE/RepositoryManager/URL_Parser.cpp | 14 |
3 files changed, 13 insertions, 12 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b62ba593da1..2589ec2c963 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Sun Jan 7 18:44:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/NodeApplicationManager/URL_Parser.cpp: + No need to set members to 0 in destructor + + * DAnCE/RepositoryManager/URL_Parser.cpp: + Fixed conversion warning and memory leak + Sun Jan 7 12:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/CCM_ClientContainerInterceptor.idl: diff --git a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp index f79e086dd89..5d211603614 100644 --- a/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp @@ -111,8 +111,5 @@ void URL_Parser::Error (void) URL_Parser::~URL_Parser (void) { delete [] this->hostname_; - this->hostname_ = 0; - ACE_OS::free (this->filename_); - this->filename_ = 0; } diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp index 3024606da7f..37187ebff61 100644 --- a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp +++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp @@ -4,6 +4,7 @@ #include "ace/ARGV.h" #include "URL_Parser.h" +#include "ace/ACE.h" #include "ace/OS_NS_string.h" bool @@ -37,7 +38,7 @@ URL_Parser::parse_args (int argc, ACE_TCHAR *argv[]) } URL_Parser::URL_Parser (void) - : hostname_ ("127.0.0.1"), + : hostname_ (ACE::strnew ("127.0.0.1")), port_ (ACE_DEFAULT_HTTP_SERVER_PORT), filename_ (0), debug_ (false) @@ -69,6 +70,7 @@ bool URL_Parser::parseURL (char* url) else { size_t host_len = ptr - url; + ACE::strdelete (this->hostname_); ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false); ACE_OS::strncpy (this->hostname_, url, host_len); this->hostname_ [host_len] = '\0'; @@ -94,12 +96,6 @@ void URL_Parser::Error (void) URL_Parser::~URL_Parser() { - if(this->hostname_) - { - delete [] this->hostname_; - } - if (this->filename_) - { - ACE_OS::free (this->filename_); - } + delete [] this->hostname_; + ACE_OS::free (this->filename_); } |