1 files changed, 35 insertions, 40 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
index 2d7d23639d9..8ad8b92c971 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
@@ -1,7 +1,4 @@
-
 // $Id$
-
-
 #include "ADD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
@@ -9,7 +6,9 @@
 #include "Req_Handler.h"
 #include "RDD_Handler.h"
 
-
+ACE_RCSID (DAnCE,
+           ADD_Handler,
+           "$Id$")
 
 namespace CIAO
 {
@@ -27,69 +26,65 @@ namespace CIAO
 
     void
     ADD_Handler::get_ArtifactDeploymentDescription (
-                    Deployment::ArtifactDeploymentDescription& toconfig, 
-                    ArtifactDeploymentDescription& desc)
+        Deployment::ArtifactDeploymentDescription& add,
+        ArtifactDeploymentDescription& desc)
     {
+      add.name=
+        CORBA::string_dup (desc.name ().c_str ());
 
+      add.source.length (add.source.length () + 1);
+
+      add.source[add.source.length () - 1]=
+        CORBA::string_dup (desc.source ().c_str ());
 
-      
-      toconfig.name=
-           CORBA::string_dup (desc.name ().c_str ());
-      
-      toconfig.source.length (
-           toconfig.source.length () + 1);
-         toconfig.source[toconfig.source.length () - 1]=
-           CORBA::string_dup (desc.source ().c_str ());
-      
       if (desc.node_p ())
        {
-         
-         toconfig.node=
+         add.node=
            CORBA::string_dup (desc.node ().c_str ());
        }
-      
+
       for (ArtifactDeploymentDescription::location_iterator
            item (desc.begin_location ());
            item != desc.end_location ();
            ++item)
-        {	 
-           toconfig.location.length (
-             toconfig.location.length () + 1);
-           toconfig.location[toconfig.location.length () - 1] =
-             CORBA::string_dup (item->c_str ());
+        {
+          add.location.length (
+              add.location.length () + 1);
+          add.location[add.location.length () - 1] =
+            CORBA::string_dup (item->c_str ());
         }
-      
+
       if (desc.execParameter_p ())
         {
-	 			  Prop_Handler handler;
-          toconfig.execParameter.length (
-            toconfig.execParameter.length () + 1);
+          Prop_Handler handler;
+
+          add.execParameter.length (
+            add.execParameter.length () + 1);
+
           handler.get_Property (
-            toconfig.execParameter[toconfig.execParameter.length () - 1],
+            add.execParameter[add.execParameter.length () - 1],
             desc.execParameter ());
         }
-      
+
       if (desc.deployRequirement_p ())
         {
-	 			  Req_Handler handler;
-          toconfig.deployRequirement.length (
-            toconfig.deployRequirement.length () + 1);
+          Req_Handler handler;
+          add.deployRequirement.length (
+            add.deployRequirement.length () + 1);
           handler.get_Requirement (
-            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
+            add.deployRequirement[add.deployRequirement.length () - 1],
             desc.deployRequirement ());
         }
-      
+
       if (desc.deployedResource_p ())
         {
-	 			  RDD_Handler handler;
-          toconfig.deployedResource.length (
-            toconfig.deployedResource.length () + 1);
+          RDD_Handler handler;
+          add.deployedResource.length (
+            add.deployedResource.length () + 1);
           handler.get_ResourceDeploymentDescription (
-            toconfig.deployedResource[toconfig.deployedResource.length () - 1],
+            add.deployedResource[add.deployedResource.length () - 1],
             desc.deployedResource ());
         }
-
-      
     }
 
   }