ChangeLogTag: Thu Jul 20 01:10:58 UTC 2006 Vipul Singh <vipuls@dre.vanderbilt.edu>

5 files changed, 64 insertions, 41 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6fa3c7da2c3..d97864639c0 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,22 @@
+Thu Jul 20 01:10:58 UTC 2006  Vipul Singh  <vipuls@dre.vanderbilt.edu>
+
+        * DAnCE/RepositoryManager/PC_Updater.cpp: Removed the variable name
+	  from the arguments in function definition in empty functions to
+	  fix warnings.
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h: Changed declaration
+	  at a few places from const static to static const to fix a few
+	  warnings, also removed an unnecessarily defined namespace.
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: Made a few
+	  changes to fix the warnings and to keep the code in sync with 
+	  the changes made to RepositoryManager_Impl.h. Fixed code which 
+	  passed non POD types to a varargs function(ACE_DEBUG) which 
+	  resulted in aborts at runtime.
+
+        * DAnCE/RepositoryManager/URL_Parser.cpp: Assigned value to ptr before
+	  if condition to fix a few warnings.
+	  
 Wed Jul 19 08:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tools/Config_Handlers/Config_Handlers.mpc:
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index dd1c5f4c767..4a809ade506 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -102,20 +102,20 @@ void PC_Updater::clear_list ()
 
   // ComponentInterfaceDescription
 
-  void PC_Updater::update (::Deployment::ComponentInterfaceDescription &cid)
+  void PC_Updater::update (::Deployment::ComponentInterfaceDescription &)
   {
   }
 
   // Requirement
 
-  void PC_Updater::update (::Deployment::Requirement &req)
+  void PC_Updater::update (::Deployment::Requirement &)
   {
   }
 
 
   // ComponentExternalPortEndpoint
 
-  void PC_Updater::update (::Deployment::ComponentExternalPortEndpoint &cepe)
+  void PC_Updater::update (::Deployment::ComponentExternalPortEndpoint &)
   {
   }
 
@@ -123,13 +123,13 @@ void PC_Updater::clear_list ()
 
   // ImplementationDependency
 
-  void PC_Updater::update (Deployment::ImplementationDependency &id)
+  void PC_Updater::update (Deployment::ImplementationDependency &)
   {
   }
 
   // ComponentPackageReference
 
-  void PC_Updater::update (::Deployment::ComponentPackageReference &cpr)
+  void PC_Updater::update (::Deployment::ComponentPackageReference &)
   {
   }
 
@@ -142,13 +142,13 @@ void PC_Updater::clear_list ()
 
   // SubcomponentPortEndpoint
 
-  void PC_Updater::update (::Deployment::SubcomponentPortEndpoint& spe)
+  void PC_Updater::update (::Deployment::SubcomponentPortEndpoint& )
   {
   }
 
   // AssemblyConnectionDescription
 
-  void PC_Updater::update (::Deployment::AssemblyConnectionDescription &acd)
+  void PC_Updater::update (::Deployment::AssemblyConnectionDescription &)
   {
   }
 
@@ -156,7 +156,7 @@ void PC_Updater::clear_list ()
   // AssemblyPropertyMapping
 
   void
-  PC_Updater::update (::Deployment::AssemblyPropertyMapping &apm)
+  PC_Updater::update (::Deployment::AssemblyPropertyMapping &)
   {
   }
 
@@ -201,10 +201,11 @@ void PC_Updater::clear_list ()
       }
       iter++;
     }
-
+    const char* location = iad.location[0];
+    
     ACE_ERROR ((LM_ERROR,
                "[PC_Updater::update] Unable to update: %s!\n",
-                iad.location[0]));
+               location));
 
     this->success_ = false;
   }
@@ -218,7 +219,7 @@ void PC_Updater::clear_list ()
 
   // ImplementationRequirement
 
-  void PC_Updater::update (::Deployment::ImplementationRequirement &ir)
+  void PC_Updater::update (::Deployment::ImplementationRequirement &)
   {
   }
 
@@ -231,7 +232,7 @@ void PC_Updater::clear_list ()
 
   // Capability
 
-  void PC_Updater::update (::Deployment::Capability &capability)
+  void PC_Updater::update (::Deployment::Capability &)
   {
   }
 
@@ -261,6 +262,6 @@ void PC_Updater::clear_list ()
 
 
   // Property
-  void PC_Updater::update (Deployment::Property& property)
+  void PC_Updater::update (Deployment::Property& )
   {
   }
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index b030eb96a3f..d689ca98822 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -48,10 +48,19 @@
 #include "PC_Updater.h"           //A visitor class to walk through the elements of the PC
 
 #include "ace/Configuration_Import_Export.h"
-
+ 
 #include <iostream>
 using namespace std;
 
+const  char* CIAO_RepositoryManagerDaemon_i::PC_EXTENSION = ".epc";
+const  char *CIAO_RepositoryManagerDaemon_i::RM_RECORD_FILE = "RM_record";
+const  char *CIAO_RepositoryManagerDaemon_i::RM_RECORD_NAME_SECTION = "Names";
+const  char *CIAO_RepositoryManagerDaemon_i::RM_RECORD_UUID_SECTION = "UUIDs";
+ 
+#if defined ASSEMBLY_INTERFACE_SUPPORT
+const char *CIAO_RepositoryManagerDaemon_i::RM_RECORD_TYPE_SECTION = "Types";
+# endif
+
 //-----------------------------------------------------------------
 //Constructor
 //
@@ -372,7 +381,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
   {
      ACE_DEBUG ((LM_ERROR,
                  "[RM] could not bind %s.\n",
-                 pc->UUID));
+                 pc->UUID.in()));
 
      //unbind the name
      this->names_.unbind (installationName);
@@ -399,7 +408,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
 
   ACE_DEBUG ((LM_INFO,
               "Installed PackageConfiguration \n\tname: %s \n\tuuid: %s\n",
-              installationName, pc->UUID));
+              installationName, pc->UUID.in()));
 }
 
 
@@ -412,7 +421,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
                                                     const char * installationName,
                                                     const ::Deployment::PackageConfiguration & package,
                                                     const char * baseLocation,
-                                                    ::CORBA::Boolean replace
+                                                    ::CORBA::Boolean 
                                                     )
                    ACE_THROW_SPEC ((
                                     CORBA::SystemException,
@@ -528,7 +537,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
   {
      ACE_DEBUG ((LM_ERROR,
                  "[RM] could not bind %s.\n",
-                 pc.UUID));
+                 pc.UUID.in()));
 
      //unbind the name
      this->names_.unbind (installationName);
@@ -554,8 +563,8 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
   this->dump ();
 
   ACE_DEBUG ((LM_INFO,
-    "Created PackageConfiguration \n  directory: %s \n  name: %s \n  uuid: %s\n",
-    path.c_str (), installationName, pc.UUID));
+	      "Created PackageConfiguration \n  directory: %s \n  name: %s \n  uuid: %s\n",
+	      path.c_str (), installationName, pc.UUID.in()));
 }
 
 
@@ -646,7 +655,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
 //-----------------------------------------------------------------
 
 ::CORBA::StringSeq * CIAO_RepositoryManagerDaemon_i::findNamesByType (
-                                                                      const char * type
+                                                                      const char * 
                                                                       )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index 2ed8b384dab..388b4df153a 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -44,19 +44,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-namespace
-{
-  const static size_t TEMP_LEN = 1024;
-
-  const static char* PC_EXTENSION = ".epc";
-
-  const static char *RM_RECORD_FILE = "RM_record";
-  const static char *RM_RECORD_NAME_SECTION = "Names";
-  const static char *RM_RECORD_UUID_SECTION = "UUIDs";
-#if defined ASSEMBLY_INTERFACE_SUPPORT
-  const static char *RM_RECORD_TYPE_SECTION = "Types";
-# endif
-}
 
 class  CIAO_RepositoryManagerDaemon_i :
   public virtual POA_CIAO::RepositoryManagerDaemon
@@ -279,8 +266,15 @@ public:
   /// a hash map that associates the UUIDs of
   /// PackageConfigurations with their location
   PCMap uuids_;
-
+  
+  static  const  size_t TEMP_LEN = 1024;
+  static  const  char* PC_EXTENSION;
+  static  const  char *RM_RECORD_FILE;
+  static  const  char *RM_RECORD_NAME_SECTION;
+  static  const  char *RM_RECORD_UUID_SECTION;
+ 
 #if defined ASSEMBLY_INTERFACE_SUPPORT
+  static const char *RM_RECORD_TYPE_SECTION;
   //a hash map which associates Component Interface
   //UUIDs with their implementations
   CIMap types_;
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
index 7eed65dafbb..5f46ae32da1 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
@@ -45,8 +45,8 @@ bool URL_Parser::parseURL (char* url)
 {
   char* ptr;
   bool success = true;
-
-  if (ptr = ACE_OS::strstr (url, "http://"))
+  ptr = ACE_OS::strstr (url, "http://");
+  if (ptr)
     url += ACE_OS::strlen ("http://");
 
   if (url[0] == '/')
@@ -54,8 +54,8 @@ bool URL_Parser::parseURL (char* url)
     this->filename_ = ACE_OS::strdup (url);
   }
   else
-  {
-    if (ptr = ACE_OS::strstr (url, ":"))
+  { ptr = ACE_OS::strstr (url, ":");
+    if (ptr)
       this->port_ = ACE_OS::atoi (ptr + 1);
     else
       ptr = ACE_OS::strstr (url, "/");
@@ -68,8 +68,8 @@ bool URL_Parser::parseURL (char* url)
       ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false);
       ACE_OS::strncpy (this->hostname_, url, host_len);
       this->hostname_ [host_len] = '\0';
-
-      if (ptr = ACE_OS::strstr (ptr, "/"))
+      ptr = ACE_OS::strstr (ptr, "/");
+      if (ptr)
       {
         this->filename_ = ACE_OS::strdup(ptr);
       }