HPCC-12741 Convert to c++11 literal-suffix ws rules

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

deployment/configutils/confighelper.cpp

@@ -136,7 +136,7 @@ bool CConfigHelper::isInBuildSet(const char* comp_process_name, const char* comp
 {
   StringBuffer xpath;
 
-  xpath.appendf("./%s/%s/%s[%s=\"%s\"][%s=\"%s\"]",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET, XML_ATTR_PROCESS_NAME, comp_process_name, XML_ATTR_NAME, comp_name);
+  xpath.appendf("./%s/%s/%s[%s=\"%s\"][%s=\"%s\"]", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET, XML_ATTR_PROCESS_NAME, comp_process_name, XML_ATTR_NAME, comp_name);
 
   if (strcmp(XML_TAG_DIRECTORIES,comp_name) != 0 && m_pDefBldSet->hasProp(xpath.str()) == false)
   {
@@ -194,7 +194,7 @@ void CConfigHelper::appendBuildSetFromPlugins()
             {
                 StringBuffer strXPath;
 
-                strXPath.appendf("./%s/%s/%s",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET);
+                strXPath.appendf("./%s/%s/%s", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET);
 
                 Owned<IPropertyTree> pPluginBuildSet = createPTreeFromXMLFile(strPluginBuildSetPath.str());
 
@@ -244,7 +244,7 @@ void CConfigHelper::getNewComponentListFromBuildSet(const IPropertyTree *pEnvTre
         return;
 
     StringBuffer xpathBuildSetFile;
-    xpathBuildSetFile.appendf("./%s/%s/%s",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET);
+    xpathBuildSetFile.appendf("./%s/%s/%s", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET);
 
     Owned<IPropertyTreeIterator> iter = m_pDefBldSet->getElements(xpathBuildSetFile.str());
 
@@ -254,7 +254,7 @@ void CConfigHelper::getNewComponentListFromBuildSet(const IPropertyTree *pEnvTre
         IPropertyTree* pSetting = &iter->query();
         StringBuffer strBuildSetName(pSetting->queryProp(XML_ATTR_NAME));
 
-        xpath.appendf("%s/%s/%s[%s=\"%s\"]",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET, XML_ATTR_NAME, strBuildSetName.str());
+        xpath.appendf("%s/%s/%s[%s=\"%s\"]", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET, XML_ATTR_NAME, strBuildSetName.str());
 
         if (pEnvTree->hasProp(xpath.str()) == false)
         {
@@ -278,12 +278,12 @@ void CConfigHelper::addNewComponentsFromBuildSetToEnv(IPropertyTree *pEnvTree) c
     for (unsigned idx = 0; idx < sCompArray.length(); idx++)
     {
         StringBuffer xpath;
-        xpath.appendf("%s/%s/%s[%s=\"%s\"]",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET, XML_ATTR_NAME, (sCompArray.item(idx)));
+        xpath.appendf("%s/%s/%s[%s=\"%s\"]", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET, XML_ATTR_NAME, (sCompArray.item(idx)));
 
         if (pEnvTree->hasProp(xpath.str()) == true)
             continue;
 
-        pEnvTree->queryPropTree( XML_TAG_PROGRAMS "/" XML_TAG_BUILD )->addPropTree(XML_TAG_BUILDSET, createPTreeFromIPT(m_pDefBldSet->queryPropTree(xpath.str())));
+        pEnvTree->queryPropTree(XML_TAG_PROGRAMS "/" XML_TAG_BUILD)->addPropTree(XML_TAG_BUILDSET, createPTreeFromIPT(m_pDefBldSet->queryPropTree(xpath.str())));
     }
 }
 

deployment/deploy/XMLTags.h

@@ -22,9 +22,9 @@
 #define XML_TAG_INCLUDE                "Include"
 
 #define XML_TAG_ENVIRONMENT            "Environment"
-#define  XML_TAG_HARDWARE                "Hardware"
+#define XML_TAG_HARDWARE               "Hardware"
 #define XML_TAG_SOFTWARE               "Software"
-#define  XML_TAG_PROGRAMS                "Programs"
+#define XML_TAG_PROGRAMS               "Programs"
 #define XML_TAG_DATA                   "Data"
 #define XML_TAG_ENVSETTINGS            "EnvSettings"
 #define XML_TAG_DIRECTORIES            "Directories"
@@ -32,12 +32,12 @@
 #define XML_TAG_ATTRIBUTESERVER        "AttributeServer"
 #define XML_TAG_ATTRSERVERINSTANCE     "AttrServerInstance"
 #define XML_TAG_AUTHENTICATION         "Authentication"
-#define  XML_TAG_BUILD                   "Build"
+#define XML_TAG_BUILD                  "Build"
 #define XML_TAG_BUILDSET               "BuildSet"
 #define XML_TAG_CLUSTER                "Cluster"
 #define XML_TAG_COMPONENT              "Component"
 #define XML_TAG_COMPONENTS             "Components"
-#define  XML_TAG_COMPUTER                "Computer"
+#define XML_TAG_COMPUTER               "Computer"
 #define XML_TAG_COMPUTERTYPE           "ComputerType"
 #define XML_TAG_DAFILESERVERPROCESS    "DafilesrvProcess"
 #define XML_TAG_DALISERVERINSTANCE     "DaliServerInstance"

deployment/deployutils/computerpicker.cpp

@@ -405,7 +405,7 @@ void CComputerPicker::Refresh()
   int iItem = 0;
   m_pComputerTree.clear();
   m_pComputerTree.setown(createPTree("ComputerList"));
-  Owned<IPropertyTreeIterator> iComputer = m_pRootNode->getElements( XML_TAG_HARDWARE "/" XML_TAG_COMPUTER );
+  Owned<IPropertyTreeIterator> iComputer = m_pRootNode->getElements(XML_TAG_HARDWARE "/" XML_TAG_COMPUTER);
   ForEach (*iComputer)
   {
     // Must have a valid name

deployment/deployutils/configenvhelper.cpp

@@ -65,7 +65,7 @@ bool CConfigEnvHelper::handleThorTopologyOp(const char* cmd, const char* xmlArg,
         {
             IPropertyTree* pComp = &iterComputers->query();
             const char* pszCompName = pComp->queryProp(XML_ATTR_NAME);
-            xpath.clear().appendf( XML_TAG_HARDWARE "/" XML_TAG_COMPUTER "/[" XML_ATTR_NAME "='%s']", pszCompName);
+            xpath.clear().appendf(XML_TAG_HARDWARE "/" XML_TAG_COMPUTER "/[" XML_ATTR_NAME "='%s']", pszCompName);
             IPropertyTree* pComputer = m_pRoot->queryPropTree(xpath.str());
 
             if (pComputer)
@@ -442,7 +442,7 @@ IPropertyTree* CConfigEnvHelper::lookupComputerByName(const char* szName) const
 {
   if (!szName || !*szName) return NULL;
 
-  Owned<IPropertyTreeIterator> iter = m_pRoot->getElements( XML_TAG_HARDWARE "/" XML_TAG_COMPUTER );
+  Owned<IPropertyTreeIterator> iter = m_pRoot->getElements(XML_TAG_HARDWARE "/" XML_TAG_COMPUTER);
   for (iter->first(); iter->isValid(); iter->next())
   {
     const char* szValue = iter->query().queryProp(XML_ATTR_NAME);
@@ -816,7 +816,7 @@ bool CConfigEnvHelper::handleRoxieSlaveConfig(const char* xmlArg)
         {
             IPropertyTree* pComp = &iterComputers->query();
             const char* pszCompName = pComp->queryProp(XML_ATTR_NAME);
-            xpath.clear().appendf( XML_TAG_HARDWARE "/" XML_TAG_COMPUTER "/[" XML_ATTR_NAME "='%s']", pszCompName);
+            xpath.clear().appendf(XML_TAG_HARDWARE "/" XML_TAG_COMPUTER "/[" XML_ATTR_NAME "='%s']", pszCompName);
             IPropertyTree* pComputer = m_pRoot->queryPropTree(xpath.str());
             
             if (pComputer)
@@ -1043,7 +1043,7 @@ bool CConfigEnvHelper::CheckTopologyComputerUse(IPropertyTree* pComputerNode, IP
         {
             IPropertyTree* pTree = &iter->query();
             const char* pszComputer = pTree->queryProp(XML_ATTR_COMPUTER);
-            xpath.clear().appendf( XML_TAG_HARDWARE "/" XML_TAG_COMPUTER "[" XML_ATTR_NAME "='%s']", pszComputer);
+            xpath.clear().appendf(XML_TAG_HARDWARE "/" XML_TAG_COMPUTER "[" XML_ATTR_NAME "='%s']", pszComputer);
             IPropertyTree* pComputer = m_pRoot->queryPropTree(xpath.str());
             const char* szNetAddress1 = pComputer?pComputer->queryProp(XML_ATTR_NETADDRESS):NULL;
             if (szNetAddress1 && strcmp(szNetAddress1, szNetAddress)==0)

deployment/deployutils/deployutils.cpp

@@ -107,7 +107,7 @@ const char* getRealTabName(const char* tabName)
     return "Type";
   else if (!strcmp(tabName, XML_TAG_COMPUTERTYPE))
     return "Computer Types";
-  else if (!strcmp(tabName,  XML_TAG_COMPUTER ))
+  else if (!strcmp(tabName, XML_TAG_COMPUTER))
     return "Computers";
   else if (!strcmp(tabName, XML_TAG_SWITCH))
     return "Switches";
@@ -1915,7 +1915,7 @@ bool generateHardwareHeaders(const IPropertyTree* pEnv, StringBuffer& sbDefn, bo
     xpath.clear().append(XML_ATTR_NICSPEED);
     pComputerType->addProp(xpath, sbdefaultValue.str());
 
-    IPropertyTree* pComputer = pCompTree->addPropTree( XML_TAG_COMPUTER , createPTree());
+    IPropertyTree* pComputer = pCompTree->addPropTree(XML_TAG_COMPUTER, createPTree());
     xpath.clear().append(XML_ATTR_NAME);
     pComputer->addProp(xpath, sbdefaultValue.str());
     xpath.clear().append(XML_ATTR_NETADDRESS);
@@ -1970,10 +1970,10 @@ bool generateHardwareHeaders(const IPropertyTree* pEnv, StringBuffer& sbDefn, bo
     addItem(jsStrBuf, pEnv, XML_TAG_DOMAIN,  TAG_USERNAME, "", 0, 1, "", 1);
     addItem(jsStrBuf, pEnv, XML_TAG_DOMAIN,  TAG_PASSWORD, "", 0, 1, "", 5);
     addItem(jsStrBuf, pEnv, XML_TAG_DOMAIN,  TAG_SNMPSECSTRING, "", 0, 1, "", 5);
-    addItem(jsStrBuf, pEnv,  XML_TAG_COMPUTER ,  TAG_NAME, "", 0, 1, "", 1);
-    addItem(jsStrBuf, pEnv,  XML_TAG_COMPUTER ,  TAG_NETADDRESS, "", 0, 1, "", 1);
-    addItem(jsStrBuf, pEnv,  XML_TAG_COMPUTER ,  TAG_DOMAIN, "", 0, 1,  XML_TAG_HARDWARE "/" XML_TAG_DOMAIN, 4);
-    addItem(jsStrBuf, pEnv,  XML_TAG_COMPUTER ,  TAG_COMPUTERTYPE, "", 0, 1,  XML_TAG_HARDWARE "/" XML_TAG_COMPUTERTYPE, 4);
+    addItem(jsStrBuf, pEnv, XML_TAG_COMPUTER,  TAG_NAME, "", 0, 1, "", 1);
+    addItem(jsStrBuf, pEnv, XML_TAG_COMPUTER,  TAG_NETADDRESS, "", 0, 1, "", 1);
+    addItem(jsStrBuf, pEnv, XML_TAG_COMPUTER,  TAG_DOMAIN, "", 0, 1, XML_TAG_HARDWARE "/" XML_TAG_DOMAIN, 4);
+    addItem(jsStrBuf, pEnv, XML_TAG_COMPUTER,  TAG_COMPUTERTYPE, "", 0, 1, XML_TAG_HARDWARE "/" XML_TAG_COMPUTERTYPE, 4);
     addItem(jsStrBuf, pEnv, XML_TAG_NAS,  TAG_NAME, "", 0, 1, "", 1);
     addItem(jsStrBuf, pEnv, XML_TAG_NAS,       TAG_SUBNET,       "", 0, 1, "", 1);
     addItem(jsStrBuf, pEnv, XML_TAG_NAS,       TAG_DIRECTORY,       "", 0, 1, "", 1);
@@ -2161,13 +2161,13 @@ bool generateBuildHeaders(const IPropertyTree* pEnv, bool isPrograms, StringBuff
   jsStrBuf.append("compTabs['Programs'] = new Array();");
   jsStrBuf.append("var compTabToNode = new Array();");
   jsStrBuf.append("var cS = new Array();");
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS , TAG_NAME, "", 0, 1, "", 1);
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS ,  TAG_URL, "", 0, 1, "", 1);
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS , TAG_PATH, "", 0, 1, "", 1);
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS ,  TAG_INSTALLSET, "", 0, 1, "", 1);
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS ,  TAG_PROCESSNAME, "", 0, 1, "", 1);
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS ,  TAG_SCHEMA, "", 0, 1, "", 1);
-  addItem(jsStrBuf, pEnv,  XML_TAG_PROGRAMS ,  TAG_DEPLOYABLE, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS, TAG_NAME, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS,  TAG_URL, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS, TAG_PATH, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS,  TAG_INSTALLSET, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS,  TAG_PROCESSNAME, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS,  TAG_SCHEMA, "", 0, 1, "", 1);
+  addItem(jsStrBuf, pEnv, XML_TAG_PROGRAMS,  TAG_DEPLOYABLE, "", 0, 1, "", 1);
   jsStrBuf.append("compTabs['Programs'][compTabs['Programs'].length]= 'Programs';");
   jsStrBuf.append("var colIndex = new Array();");
   jsStrBuf.appendf("colIndex['namePrograms']=%d;", index++);
@@ -2240,14 +2240,14 @@ nodeFullData[0] = nodeRoot;  \
     StringBuffer compTypeName;
     compTypeTree.getName(compTypeName);
 
-    if (!stricmp(compTypeName.str(), "Data") || !stricmp(compTypeName.str(), "EnvSettings") || !strcmp(compTypeName.str(),  XML_TAG_PROGRAMS ))
+    if (!stricmp(compTypeName.str(), "Data") || !stricmp(compTypeName.str(), "EnvSettings") || !strcmp(compTypeName.str(), XML_TAG_PROGRAMS))
       continue;
 
     const char* pszCompTypeName = compTypeName.str();
     jsStrBuf.appendf("var node%s = {};", pszCompTypeName);
     jsStrBuf.appendf("node%s['Name'] = '%s';", pszCompTypeName, pszCompTypeName);
 
-    if (!strcmp(pszCompTypeName,  XML_TAG_PROGRAMS ))
+    if (!strcmp(pszCompTypeName, XML_TAG_PROGRAMS))
       jsStrBuf.appendf("node%s['DisplayName'] = '%s';", pszCompTypeName, "Builds");
     else if (!strcmp(pszCompTypeName, "EnvSettings"))
       jsStrBuf.appendf("node%s['DisplayName'] = '%s';", pszCompTypeName, "Environment Settings");
@@ -3003,7 +3003,7 @@ IPropertyTree* getNewRange(const IPropertyTree* pEnv, const char* prefix, const
      range.getNetAddress(sizeof(x),&x);
 
      StringBuffer strCheckXPath;
-     strCheckXPath.setf("%s/%s[%s=\"%s\"][1]",  XML_TAG_HARDWARE ,  XML_TAG_COMPUTER , XML_ATTR_NETADDRESS, sIP.str());
+     strCheckXPath.setf("%s/%s[%s=\"%s\"][1]", XML_TAG_HARDWARE, XML_TAG_COMPUTER, XML_ATTR_NETADDRESS, sIP.str());
 
      if (pEnv->hasProp(strCheckXPath.str()) == true)
      {
@@ -3013,7 +3013,7 @@ IPropertyTree* getNewRange(const IPropertyTree* pEnv, const char* prefix, const
 
      sName.clear().appendf("%s%03d%03d", prefix, (x >> 16) & 0xFF, (x >> 24) & 0xFF);
      sNode.appendf("<" XML_TAG_COMPUTER " %s=\"%s\" %s=\"%s\" %s/>",
-                      &XML_ATTR_NAME[1], getUniqueName(pEnv, sName,  XML_TAG_COMPUTER ,  XML_TAG_HARDWARE ),
+                      &XML_ATTR_NAME[1], getUniqueName(pEnv, sName, XML_TAG_COMPUTER, XML_TAG_HARDWARE),
                       &XML_ATTR_NETADDRESS[1], sIP.str(),
                       attr.str());
      range.ipincrement(1);
@@ -3547,7 +3547,7 @@ void getSummary(const IPropertyTree* pEnvRoot, StringBuffer& respXmlStr, bool pr
           {
             if(pCompTree->hasProp(XML_ATTR_COMPUTER))
             { 
-              xpath.clear().appendf("./Hardware/%s/[%s=\"%s\"]",  XML_TAG_COMPUTER , XML_ATTR_NAME, pCompTree->queryProp(XML_ATTR_COMPUTER));
+              xpath.clear().appendf("./Hardware/%s/[%s=\"%s\"]", XML_TAG_COMPUTER, XML_ATTR_NAME, pCompTree->queryProp(XML_ATTR_COMPUTER));
               IPropertyTree* pHardware = pEnvRoot->queryPropTree(xpath.str());
               if(pHardware)
                 ipAssigned.clear().append(pHardware->queryProp(XML_ATTR_NETADDRESS));
@@ -3585,7 +3585,7 @@ void getSummary(const IPropertyTree* pEnvRoot, StringBuffer& respXmlStr, bool pr
                  computerName.clear().append(pMaster->queryProp(XML_ATTR_COMPUTER));
                  if(computerName.length())
                  {
-                   xpath.clear().appendf("./Hardware/%s/[%s=\"%s\"]",  XML_TAG_COMPUTER , XML_ATTR_NAME, computerName.str());
+                   xpath.clear().appendf("./Hardware/%s/[%s=\"%s\"]", XML_TAG_COMPUTER, XML_ATTR_NAME, computerName.str());
                    IPropertyTree* pHardware = pEnvRoot->queryPropTree(xpath.str());
                    if(pHardware)
                      ipAssigned.clear().append(pHardware->queryProp(XML_ATTR_NETADDRESS)).append(",");
@@ -3598,7 +3598,7 @@ void getSummary(const IPropertyTree* pEnvRoot, StringBuffer& respXmlStr, bool pr
                  computerName.clear().append(pServer->queryProp(XML_ATTR_COMPUTER));
                  if(computerName.length())
                  {
-                   xpath.clear().appendf("./Hardware/%s/[%s=\"%s\"]",  XML_TAG_COMPUTER , XML_ATTR_NAME, computerName.str());
+                   xpath.clear().appendf("./Hardware/%s/[%s=\"%s\"]", XML_TAG_COMPUTER, XML_ATTR_NAME, computerName.str());
                    IPropertyTree* pHardware = pEnvRoot->queryPropTree(xpath.str());
                    if(pHardware)
                      ipAssigned.append(pHardware->queryProp(XML_ATTR_NETADDRESS)).append(",");

deployment/deployutils/wizardInputs.cpp

@@ -472,11 +472,11 @@ IPropertyTree* CWizardInputs::createEnvironment()
   }
 
   Owned<IPropertyTree> pProgramTree = createPTreeFromIPT(m_buildSetTree);
-  pNewEnvTree->addPropTree( XML_TAG_PROGRAMS , createPTreeFromIPT(pProgramTree->queryPropTree("./" XML_TAG_PROGRAMS )));
+  pNewEnvTree->addPropTree(XML_TAG_PROGRAMS, createPTreeFromIPT(pProgramTree->queryPropTree("./" XML_TAG_PROGRAMS)));
 
-  Owned<IPropertyTree> pCompTree = createPTree( XML_TAG_HARDWARE );
+  Owned<IPropertyTree> pCompTree = createPTree(XML_TAG_HARDWARE);
   generateHardwareHeaders(pNewEnvTree, sbTemp, false, pCompTree);
-  pCompTree->removeProp( XML_TAG_COMPUTER );
+  pCompTree->removeProp(XML_TAG_COMPUTER);
   xpath.clear().appendf("./%s/%s", XML_TAG_COMPUTERTYPE, XML_ATTR_MEMORY);
   pCompTree->removeProp(xpath.str());
   xpath.clear().appendf("./%s/%s", XML_TAG_COMPUTERTYPE, XML_ATTR_NICSPEED);
@@ -510,11 +510,11 @@ IPropertyTree* CWizardInputs::createEnvironment()
 
   for(unsigned i = 0; i < m_ipaddressSupport.ordinality(); i++)
   {
-    IPropertyTree* pComputer = pCompTree->addPropTree( XML_TAG_COMPUTER ,createPTree());
+    IPropertyTree* pComputer = pCompTree->addPropTree(XML_TAG_COMPUTER,createPTree());
     ipaddr.ipset(m_ipaddressSupport.item(i));
     ipaddr.getNetAddress(sizeof(x),&x);
     name.clear().appendf("node%03d%03d", (x >> 16) & 0xFF, (x >> 24) & 0xFF);
-    getUniqueName(pCompTree, name,  XML_TAG_COMPUTER , "");
+    getUniqueName(pCompTree, name, XML_TAG_COMPUTER, "");
     pComputer->addProp(XML_ATTR_COMPUTERTYPE, "linuxmachine");
     pComputer->addProp(XML_ATTR_DOMAIN, "localdomain");
     pComputer->addProp(XML_ATTR_NAME, name.str());
@@ -523,18 +523,18 @@ IPropertyTree* CWizardInputs::createEnvironment()
 
   for(unsigned i = 0; i < m_ipaddress.ordinality(); i++)
   {
-    IPropertyTree* pComputer = pCompTree->addPropTree( XML_TAG_COMPUTER ,createPTree());
+    IPropertyTree* pComputer = pCompTree->addPropTree(XML_TAG_COMPUTER,createPTree());
     ipaddr.ipset(m_ipaddress.item(i));
     ipaddr.getNetAddress(sizeof(x),&x);
     name.clear().appendf("node%03d%03d", (x >> 16) & 0xFF, (x >> 24) & 0xFF);
-    getUniqueName(pCompTree, name,  XML_TAG_COMPUTER , "");
+    getUniqueName(pCompTree, name, XML_TAG_COMPUTER, "");
     pComputer->addProp(XML_ATTR_COMPUTERTYPE, "linuxmachine");
     pComputer->addProp(XML_ATTR_DOMAIN, "localdomain");
     pComputer->addProp(XML_ATTR_NAME, name.str());
     pComputer->addProp(XML_ATTR_NETADDRESS, m_ipaddress.item(i));
   }
 
-  pNewEnvTree->addPropTree( XML_TAG_HARDWARE , createPTreeFromIPT(pCompTree));
+  pNewEnvTree->addPropTree(XML_TAG_HARDWARE, createPTreeFromIPT(pCompTree));
   //Before we generate software tree check for dependencies of component for do_not_generate ,roxie, thor
   checkForDependencies();
   generateSoftwareTree(pNewEnvTree);
@@ -585,12 +585,12 @@ void CWizardInputs::generateSoftwareTree(IPropertyTree* pNewEnvTree)
     }
 
     const char* firstComp = "esp";
-    xpath.clear().appendf("./%s/%s/%s/[@name=\"%s\"]",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET, firstComp);
+    xpath.clear().appendf("./%s/%s/%s/[@name=\"%s\"]", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET, firstComp);
     IPropertyTree* pEspBuildSet = m_buildSetTree->queryPropTree(xpath.str());
     if (pEspBuildSet)
       addComponentToSoftware(pNewEnvTree, pEspBuildSet);
 
-    xpath.clear().appendf("./%s/%s/%s",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET);
+    xpath.clear().appendf("./%s/%s/%s", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET);
     Owned<IPropertyTreeIterator> buildSetInsts = m_buildSetTree->getElements(xpath.str());
 
     ForEach(*buildSetInsts)
@@ -611,7 +611,7 @@ void CWizardInputs::generateSoftwareTree(IPropertyTree* pNewEnvTree)
 void CWizardInputs::addInstanceToTree(IPropertyTree* pNewEnvTree, StringBuffer attrName, const char* processName, const char* buildSetName, const char* instName)
 {
   StringBuffer sb, sbl, compName, xpath, nodeName;
-  xpath.clear().appendf("./%s/%s[%s=\"%s\"]",  XML_TAG_HARDWARE ,  XML_TAG_COMPUTER , XML_ATTR_NETADDRESS, attrName.str());
+  xpath.clear().appendf("./%s/%s[%s=\"%s\"]", XML_TAG_HARDWARE, XML_TAG_COMPUTER, XML_ATTR_NETADDRESS, attrName.str());
   IPropertyTree* pHardTemp = pNewEnvTree->queryPropTree(xpath.str());
   if(pHardTemp)
     nodeName.clear().append(pHardTemp->queryProp("./" XML_ATTR_NAME));//NodeName
@@ -638,8 +638,8 @@ void CWizardInputs::addInstanceToTree(IPropertyTree* pNewEnvTree, StringBuffer a
 void CWizardInputs::getDefaultsForWizard(IPropertyTree* pNewEnvTree)
 {
   StringBuffer xpath, tempName, value;
-  Owned<IPropertyTree> pBuildTree = createPTreeFromIPT(pNewEnvTree->queryPropTree("./" XML_TAG_PROGRAMS ));
-  xpath.clear().appendf("./%s/%s/",  XML_TAG_BUILD , XML_TAG_BUILDSET);
+  Owned<IPropertyTree> pBuildTree = createPTreeFromIPT(pNewEnvTree->queryPropTree("./" XML_TAG_PROGRAMS));
+  xpath.clear().appendf("./%s/%s/", XML_TAG_BUILD, XML_TAG_BUILDSET);
   Owned<IPropertyTreeIterator> buildSetInsts = pBuildTree->getElements(xpath.str());
 
   ForEach(*buildSetInsts)
@@ -828,7 +828,7 @@ void CWizardInputs::addRoxieThorClusterToEnv(IPropertyTree* pNewEnvTree, CInstDe
       xmlForRoxieServers.append("<Instances>");
       ForEachItemIn(i, ipAssignedToComp)
       {
-        xpath.clear().appendf("./%s/%s/[%s=\"%s\"]",  XML_TAG_HARDWARE ,  XML_TAG_COMPUTER , XML_ATTR_NETADDRESS, ipAssignedToComp.item(i));
+        xpath.clear().appendf("./%s/%s/[%s=\"%s\"]", XML_TAG_HARDWARE, XML_TAG_COMPUTER, XML_ATTR_NETADDRESS, ipAssignedToComp.item(i));
         IPropertyTree* pHardTemp = pNewEnvTree->queryPropTree(xpath.str());
         if(pHardTemp){
          xmlForRoxiePorts.appendf("<Component name=\"%s\" />", pHardTemp->queryProp("./@name"));
@@ -860,7 +860,7 @@ void CWizardInputs::addRoxieThorClusterToEnv(IPropertyTree* pNewEnvTree, CInstDe
       if(!ipAssignedToComp.empty())
         masterIP.clear().append(ipAssignedToComp.item(0));
     
-      xpath.clear().appendf("./%s/%s[%s=\"%s\"]",  XML_TAG_HARDWARE ,  XML_TAG_COMPUTER , XML_ATTR_NETADDRESS, masterIP.str());
+      xpath.clear().appendf("./%s/%s[%s=\"%s\"]", XML_TAG_HARDWARE, XML_TAG_COMPUTER, XML_ATTR_NETADDRESS, masterIP.str());
       IPropertyTree* pHardTemp = pNewEnvTree->queryPropTree(xpath.str());
       if(pHardTemp)
         xml.clear().appendf("<ThorData type=\"Master\" name=\"%s\" validateComputers=\"false\" skipExisting=\"false\" > <Computer name=\"%s\" /></ThorData>", compName.str(), pHardTemp->queryProp("./@name"));
@@ -872,7 +872,7 @@ void CWizardInputs::addRoxieThorClusterToEnv(IPropertyTree* pNewEnvTree, CInstDe
 
       for( ; numOfNodes < ipAssignedToComp.ordinality() ; numOfNodes++)
       {
-        xpath.clear().appendf("./%s/%s[%s=\"%s\"]",  XML_TAG_HARDWARE ,  XML_TAG_COMPUTER , XML_ATTR_NETADDRESS, ipAssignedToComp.item(numOfNodes));
+        xpath.clear().appendf("./%s/%s[%s=\"%s\"]", XML_TAG_HARDWARE, XML_TAG_COMPUTER, XML_ATTR_NETADDRESS, ipAssignedToComp.item(numOfNodes));
         IPropertyTree* pHardTemp = pNewEnvTree->queryPropTree(xpath.str());
         if(pHardTemp)
           xml.appendf("<Computer name=\"%s\" />", pHardTemp->queryProp("./@name"));
@@ -892,7 +892,7 @@ void CWizardInputs::getEspBindingInformation(IPropertyTree* pNewEnvTree)
    {
      IPropertyTree* pEspProcess = &espProcessIter->query();
      compName.clear().append(pEspProcess->queryProp(XML_ATTR_NAME));
-     xpath.clear().appendf("./%s/%s/%s[@processName=\"%s\"]",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET, XML_TAG_ESPSERVICE);
+     xpath.clear().appendf("./%s/%s/%s[@processName=\"%s\"]", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET, XML_TAG_ESPSERVICE);
      Owned<IPropertyTreeIterator> espServiceIter = pNewEnvTree->getElements(xpath.str());
        
      ForEach (*espServiceIter)
@@ -1014,7 +1014,7 @@ IPropertyTree* CWizardInputs::createTopologyForComp(IPropertyTree* pNewEnvTree,
             for(unsigned i = 0 ; i < clusterCompEle->ordinality() ; i++)
             {
               const char* eachClusterElem = clusterCompEle->item(i);
-              xpath.clear().appendf("./%s/%s/%s[%s=\"%s\"]",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET, XML_ATTR_NAME, eachClusterElem);
+              xpath.clear().appendf("./%s/%s/%s[%s=\"%s\"]", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET, XML_ATTR_NAME, eachClusterElem);
               IPropertyTree* pBuildset = pNewEnvTree->queryPropTree(xpath.str());
               if(pBuildset)
               {
@@ -1044,7 +1044,7 @@ void CWizardInputs::checkForDependencies()
   
   if(m_buildSetTree)
   {
-    xpath.clear().appendf("./%s/%s/%s",  XML_TAG_PROGRAMS ,  XML_TAG_BUILD , XML_TAG_BUILDSET);
+    xpath.clear().appendf("./%s/%s/%s", XML_TAG_PROGRAMS, XML_TAG_BUILD, XML_TAG_BUILDSET);
     Owned<IPropertyTreeIterator> buildSetInsts = m_buildSetTree->getElements(xpath.str());
     ForEach(*buildSetInsts)
     {

esp/services/WsDeploy/WsDeployService.cpp

@@ -183,7 +183,7 @@ void expandRange(IPropertyTree* pComputers)
 
         for(unsigned i = 0 ; i < ipList.ordinality(); i++)
         {
-          IPropertyTree* pElem = pComputers->addPropTree( XML_TAG_COMPUTER ,createPTree());
+          IPropertyTree* pElem = pComputers->addPropTree(XML_TAG_COMPUTER,createPTree());
           pElem->addProp(XML_ATTR_NETADDRESS,ipList.item(i));
         }
 
@@ -943,7 +943,7 @@ bool CWsDeployFileInfo::saveSetting(IEspContext &context, IEspSaveSettingRequest
   const char* xmlArg = req.getXmlArgs();
   Owned<IPropertyTree> pEnvRoot = &m_Environment->getPTree();
   IPropertyTree* pEnvSoftware = pEnvRoot->queryPropTree(XML_TAG_SOFTWARE);
-  IPropertyTree* pEnvHardware = pEnvRoot->queryPropTree( XML_TAG_HARDWARE );
+  IPropertyTree* pEnvHardware = pEnvRoot->queryPropTree(XML_TAG_HARDWARE);
 
   Owned<IPropertyTree> pSrcTree = createPTreeFromXMLString(xmlArg && *xmlArg ? xmlArg : "<XmlArgs/>");
   IPropertyTree* pSoftwareFolder = pSrcTree->queryPropTree("Setting[@category='Software']");
@@ -1838,17 +1838,17 @@ bool CWsDeployFileInfo::saveSetting(IEspContext &context, IEspSaveSettingRequest
         //update references
         if (!strcmp(pszAttrName, "name"))
         {
-          if (!strcmp(pszSubType,  XML_TAG_COMPUTER ))
+          if (!strcmp(pszSubType, XML_TAG_COMPUTER))
           {
             UpdateRefAttributes(pEnvRoot, XML_TAG_SOFTWARE"//*", XML_ATTR_COMPUTER, pszOldValue, pszNewValue);
             UpdateRefAttributes(pEnvRoot, XML_TAG_SOFTWARE "/" XML_TAG_DALISERVERPROCESS, XML_ATTR_BACKUPCOMPUTER, pszOldValue, pszNewValue);
           }
           else if (!strcmp(pszSubType, XML_TAG_DOMAIN))
-            UpdateRefAttributes(pEnvRoot,  XML_TAG_HARDWARE "/" XML_TAG_COMPUTER , XML_ATTR_DOMAIN, pszOldValue, pszNewValue);
+            UpdateRefAttributes(pEnvRoot, XML_TAG_HARDWARE "/" XML_TAG_COMPUTER, XML_ATTR_DOMAIN, pszOldValue, pszNewValue);
           else if (!strcmp(pszSubType, XML_TAG_SWITCH))
-            UpdateRefAttributes(pEnvRoot,  XML_TAG_HARDWARE "/" XML_TAG_COMPUTER , XML_ATTR_SWITCH, pszOldValue, pszNewValue);
+            UpdateRefAttributes(pEnvRoot, XML_TAG_HARDWARE "/" XML_TAG_COMPUTER, XML_ATTR_SWITCH, pszOldValue, pszNewValue);
           else if (!strcmp(pszSubType, XML_TAG_COMPUTERTYPE))
-            UpdateRefAttributes(pEnvRoot,  XML_TAG_HARDWARE "/" XML_TAG_COMPUTER , XML_ATTR_COMPUTERTYPE, pszOldValue, pszNewValue);
+            UpdateRefAttributes(pEnvRoot, XML_TAG_HARDWARE "/" XML_TAG_COMPUTER, XML_ATTR_COMPUTERTYPE, pszOldValue, pszNewValue);
         }
         else if (!strcmp(pszAttrName, "netAddress"))
         {
@@ -2524,8 +2524,8 @@ bool CWsDeployFileInfo::getValue(IEspContext &context, IEspGetValueRequest &req,
       String str(szPath);
       Owned<IPropertyTreeIterator> iter; 
       if (str.startsWith(XML_TAG_SOFTWARE) || 
-        str.startsWith( XML_TAG_HARDWARE ) || 
-        str.startsWith( XML_TAG_PROGRAMS ))
+        str.startsWith(XML_TAG_HARDWARE) ||
+        str.startsWith(XML_TAG_PROGRAMS))
         iter.setown(pEnvRoot->getElements(szPath));
       else
         iter.setown(pNode->getElements(szPath));
@@ -2601,7 +2601,7 @@ bool CWsDeployFileInfo::getValue(IEspContext &context, IEspGetValueRequest &req,
   }
   else if(pszQueryType && !strcmp(pszQueryType, "DomainsAndComputerTypes"))
   {
-    xpath.clear().append( XML_TAG_HARDWARE "/" XML_TAG_DOMAIN);
+    xpath.clear().append(XML_TAG_HARDWARE "/" XML_TAG_DOMAIN);
     sbMultiple.append("<Domains>");
     bool flag = false;
     Owned<IPropertyTreeIterator> pDomains = pEnvRoot->getElements(xpath.str());
@@ -2618,7 +2618,7 @@ bool CWsDeployFileInfo::getValue(IEspContext &context, IEspGetValueRequest &req,
 
     flag = false;
 
-    xpath.clear().append( XML_TAG_HARDWARE "/" XML_TAG_COMPUTERTYPE);
+    xpath.clear().append(XML_TAG_HARDWARE "/" XML_TAG_COMPUTERTYPE);
     sbMultiple.append("<ComputerTypes>");
     Owned<IPropertyTreeIterator> pCTypes = pEnvRoot->getElements(xpath.str());
     ForEach(*pCTypes)
@@ -3371,7 +3371,7 @@ bool CWsDeployFileInfo::displaySettings(IEspContext &context, IEspDisplaySetting
   }
   else if (pHardwareFolder)
   {
-    IPropertyTree* pEnvHardware = pEnvRoot->queryPropTree( XML_TAG_HARDWARE );
+    IPropertyTree* pEnvHardware = pEnvRoot->queryPropTree(XML_TAG_HARDWARE);
     
     generateHardwareHeaders(pEnvRoot, sbDefn);
     resp.setCompDefn(sbDefn.str());
@@ -3392,9 +3392,9 @@ bool CWsDeployFileInfo::displaySettings(IEspContext &context, IEspDisplaySetting
     //add any missing parameters
     Owned<IPropertyTree> pSrcTree = createPTreeFromXMLString(xml);
     StringBuffer sbTemp;
-    Owned<IPropertyTree> pNewCompTree = createPTree( XML_TAG_HARDWARE );
+    Owned<IPropertyTree> pNewCompTree = createPTree(XML_TAG_HARDWARE);
     generateHardwareHeaders(pEnvRoot, sbTemp, false, pNewCompTree);
-    const char* pElemNames[] = { XML_TAG_COMPUTER };
+    const char* pElemNames[] = {XML_TAG_COMPUTER};
     bool modified = false;
 
     for (int i = 0; i < sizeof(pElemNames)/sizeof(char*); i++)
@@ -3425,12 +3425,12 @@ bool CWsDeployFileInfo::displaySettings(IEspContext &context, IEspDisplaySetting
       toXML(pSrcTree, xml, false);
     }
 
-    resp.setComponent( XML_TAG_HARDWARE );
+    resp.setComponent(XML_TAG_HARDWARE);
     resp.setXmlArgs( xml.str() );
   }
   else if (pBuildFolder)
   {
-    IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree( XML_TAG_PROGRAMS );
+    IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree(XML_TAG_PROGRAMS);
 
     generateBuildHeaders(pEnvRoot, true, sbDefn, false);
     resp.setCompDefn(sbDefn.str());
@@ -3438,7 +3438,7 @@ bool CWsDeployFileInfo::displaySettings(IEspContext &context, IEspDisplaySetting
     StringBuffer xml;
     toXML(pEnvPrograms, xml, false);
     xml.replaceString(" url="," path=");
-    resp.setComponent( XML_TAG_PROGRAMS );
+    resp.setComponent(XML_TAG_PROGRAMS);
     resp.setXmlArgs( xml.str() );
   }
   else if (pBuildSet)
@@ -3446,7 +3446,7 @@ bool CWsDeployFileInfo::displaySettings(IEspContext &context, IEspDisplaySetting
     generateBuildHeaders(pEnvRoot, false, sbDefn, false);
     resp.setCompDefn(sbDefn.str());
 
-    IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree( XML_TAG_PROGRAMS );
+    IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree(XML_TAG_PROGRAMS);
     Owned<IPropertyTreeIterator> iter = pParamTree->getElements(XML_TAG_BUILDSET);
     ForEach (*iter)
     {
@@ -3672,7 +3672,7 @@ bool CWsDeployFileInfo::getBuildSetInfo(IEspContext &context, IEspGetBuildSetInf
 
   if (pBuildSet)
   {
-    IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree( XML_TAG_PROGRAMS );
+    IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree(XML_TAG_PROGRAMS);
     Owned<IPropertyTreeIterator> iter = pSrcTree->getElements(XML_TAG_BUILDSET);
 
     ForEach (*iter)
@@ -3727,7 +3727,7 @@ bool CWsDeployFileInfo::importBuild(IEspContext &context, IEspImportBuildRequest
 
   const char* xmlArg = req.getBuildSets();
   IPropertyTree* buildSets = createPTreeFromXMLString(xmlArg && *xmlArg ? xmlArg : "<BuildSets/>");
-  IPropertyTree* buildNode = createPTree( XML_TAG_BUILD );
+  IPropertyTree* buildNode = createPTree(XML_TAG_BUILD);
   const char* buildName = buildSets->queryProp(XML_ATTR_NAME);
   const char* buildUrl = buildSets->queryProp("@path");
   buildNode->setProp(XML_ATTR_NAME, buildName);
@@ -3773,12 +3773,12 @@ bool CWsDeployFileInfo::importBuild(IEspContext &context, IEspImportBuildRequest
   }
 
   Owned<IPropertyTree> pEnvRoot = &m_Environment->getPTree();
-  IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree( XML_TAG_PROGRAMS );
+  IPropertyTree* pEnvPrograms = pEnvRoot->queryPropTree(XML_TAG_PROGRAMS);
 
   if (!pEnvPrograms)
-    pEnvPrograms = pEnvRoot->addPropTree( XML_TAG_PROGRAMS , createPTree() );
+    pEnvPrograms = pEnvRoot->addPropTree(XML_TAG_PROGRAMS, createPTree() );
 
-  pEnvPrograms->addPropTree( XML_TAG_BUILD , buildNode);
+  pEnvPrograms->addPropTree(XML_TAG_BUILD, buildNode);
   resp.setStatus("true");
 
   return true;
@@ -4183,7 +4183,7 @@ bool CWsDeployFileInfo::handleComponent(IEspContext &context, IEspHandleComponen
 bool CWsDeployFileInfo::addCopyToPropTree(IPropertyTree* pPropTree, IPropertyTree* pDupTree, const char* tag_name)
 {
   StringBuffer strTag;
-  strTag.clear().appendf("%s/%s",  XML_TAG_HARDWARE , tag_name);
+  strTag.clear().appendf("%s/%s", XML_TAG_HARDWARE, tag_name);
 
   return pPropTree->addPropTree(strTag.str(), pDupTree) != NULL;
 }
@@ -4193,7 +4193,7 @@ bool CWsDeployFileInfo::handleHardwareCopy(IPropertyTree *pComponents, IProperty
   StringBuffer xpath;
   StringBuffer xpath3;
   StringBuffer filePath;
-  xpath.clear().appendf("%s",  XML_TAG_HARDWARE );
+  xpath.clear().appendf("%s", XML_TAG_HARDWARE);
 
   Owned<IPropertyTreeIterator> iterComp = pComponents->getElements("*");
   Owned<IPropertyTreeIterator> iter = pEnvRoot->getElements("*");
@@ -4219,7 +4219,7 @@ bool CWsDeployFileInfo::handleHardwareCopy(IPropertyTree *pComponents, IProperty
     const char* tag_name = pComp.queryName();
 
     StringBuffer xpath2;
-    xpath2.appendf("./%s/%s[%s = \"%s\"]",  XML_TAG_HARDWARE , tag_name, XML_ATTR_NAME, name);
+    xpath2.appendf("./%s/%s[%s = \"%s\"]", XML_TAG_HARDWARE, tag_name, XML_ATTR_NAME, name);
 
     if (pEnvRoot2->queryPropTree(xpath2.str()) != NULL) // check if target configuration has same named element
     {
@@ -4759,17 +4759,17 @@ bool CWsDeployFileInfo::handleComputer(IEspContext &context, IEspHandleComputerR
   if (!strcmp(operation, "New"))
   {
     StringBuffer sbTemp;
-    IPropertyTree* pCompTree = createPTree( XML_TAG_HARDWARE );
+    IPropertyTree* pCompTree = createPTree(XML_TAG_HARDWARE);
     generateHardwareHeaders(pEnvRoot, sbTemp, false, pCompTree, true);
 
     StringBuffer sbNewName(type);
     xpath.clear().appendf("%s", type);
 
-    getUniqueName(pEnvRoot, sbNewName, xpath.str(),  XML_TAG_HARDWARE );
+    getUniqueName(pEnvRoot, sbNewName, xpath.str(), XML_TAG_HARDWARE);
     xpath.clear().append(type).append("/").append(XML_ATTR_NAME);
     pCompTree->setProp(xpath.str(), sbNewName);
 
-    pEnvRoot->queryPropTree( XML_TAG_HARDWARE )->addPropTree(type, pCompTree->queryPropTree(type));
+    pEnvRoot->queryPropTree(XML_TAG_HARDWARE)->addPropTree(type, pCompTree->queryPropTree(type));
 
     resp.setCompName(sbNewName.str());
     resp.setStatus("true");
@@ -4798,7 +4798,7 @@ bool CWsDeployFileInfo::handleComputer(IEspContext &context, IEspHandleComputerR
 
     if (pComps)
     {
-      mergePTree(pEnvRoot->queryPropTree( XML_TAG_HARDWARE ), pComps);
+      mergePTree(pEnvRoot->queryPropTree(XML_TAG_HARDWARE), pComps);
       resp.setCompName(pComps->queryPropTree("Computer[1]")->queryProp(XML_ATTR_NAME));
     }
 
@@ -4814,14 +4814,14 @@ bool CWsDeployFileInfo::handleComputer(IEspContext &context, IEspHandleComputerR
       IPropertyTree* pComp = &iterComputers->query();
 
       const char* name = pComp->queryProp(XML_ATTR_NAME);
-      if (!strcmp(type,  XML_TAG_COMPUTER ))
+      if (!strcmp(type, XML_TAG_COMPUTER))
         xpath.clear().appendf(XML_TAG_SOFTWARE"//[" XML_ATTR_COMPUTER "=\"%s\"]", name);
       else if (!strcmp(type, XML_TAG_COMPUTERTYPE))
-        xpath.clear().appendf( XML_TAG_HARDWARE "//[" XML_ATTR_COMPUTERTYPE "=\"%s\"]", name);
+        xpath.clear().appendf(XML_TAG_HARDWARE "//[" XML_ATTR_COMPUTERTYPE "=\"%s\"]", name);
       else if (!strcmp(type, XML_TAG_DOMAIN))
-        xpath.clear().appendf( XML_TAG_HARDWARE "//[" XML_ATTR_DOMAIN "=\"%s\"]", name);
+        xpath.clear().appendf(XML_TAG_HARDWARE "//[" XML_ATTR_DOMAIN "=\"%s\"]", name);
       else if (!strcmp(type, XML_TAG_SWITCH))
-        xpath.clear().appendf( XML_TAG_HARDWARE "//[" XML_ATTR_SWITCH "=\"%s\"]", name);
+        xpath.clear().appendf(XML_TAG_HARDWARE "//[" XML_ATTR_SWITCH "=\"%s\"]", name);
 
       Owned<IPropertyTreeIterator> iter = pEnvRoot->getElements(xpath.str());
 
@@ -4846,14 +4846,14 @@ bool CWsDeployFileInfo::handleComputer(IEspContext &context, IEspHandleComputerR
       throw MakeStringException(-1, "Cannot delete %s with name %s as it is being referenced by components: %s.", type, refName.str(), refs.str());
     else
     {
-      if (m_bCloud && !strcmp(type,  XML_TAG_COMPUTER ))
+      if (m_bCloud && !strcmp(type, XML_TAG_COMPUTER))
       {
         StringBuffer sb, sbMsg;
         sb.append("<Computers>");
         ForEach (*iterComputers)
         {
           IPropertyTree* pComp = &iterComputers->query();
-          xpath.clear().appendf( XML_TAG_HARDWARE "/%s[" XML_ATTR_NAME "=\"%s\"]", type, pComp->queryProp(XML_ATTR_NAME));
+          xpath.clear().appendf(XML_TAG_HARDWARE "/%s[" XML_ATTR_NAME "=\"%s\"]", type, pComp->queryProp(XML_ATTR_NAME));
           IPropertyTree* pTree = pEnvRoot->queryPropTree(xpath.str());
           sb.appendf("<Computer netAddress='%s'/>", pTree->queryProp(XML_ATTR_NETADDRESS));
         }
@@ -4869,9 +4869,9 @@ bool CWsDeployFileInfo::handleComputer(IEspContext &context, IEspHandleComputerR
       ForEach (*iterComputers)
       {
         IPropertyTree* pComp = &iterComputers->query();
-        xpath.clear().appendf( XML_TAG_HARDWARE "/%s[" XML_ATTR_NAME "=\"%s\"]", type, pComp->queryProp(XML_ATTR_NAME));
+        xpath.clear().appendf(XML_TAG_HARDWARE "/%s[" XML_ATTR_NAME "=\"%s\"]", type, pComp->queryProp(XML_ATTR_NAME));
         IPropertyTree* pTree = pEnvRoot->queryPropTree(xpath.str());
-        pEnvRoot->queryPropTree( XML_TAG_HARDWARE )->removeTree(pTree);
+        pEnvRoot->queryPropTree(XML_TAG_HARDWARE)->removeTree(pTree);
       }
        
       resp.setStatus("true");
@@ -5916,10 +5916,10 @@ void CWsDeployFileInfo::unlockEnvironment(IEspContext* context, IConstWsDeployRe
       ForEach (*iter)
       {
         IPropertyTree* pComputer = &iter->query();
-        xpath.clear().appendf( XML_TAG_COMPUTER "[" XML_ATTR_NETADDRESS "='%s']", pComputer->queryProp(XML_ATTR_NETADDRESS));
+        xpath.clear().appendf(XML_TAG_COMPUTER "[" XML_ATTR_NETADDRESS "='%s']", pComputer->queryProp(XML_ATTR_NETADDRESS));
 
         if (!m_lockedNodesBeforeEnv->queryPropTree(xpath.str()))
-          lockComputers->addPropTree( XML_TAG_COMPUTER , createPTreeFromIPT(pComputer));
+          lockComputers->addPropTree(XML_TAG_COMPUTER, createPTreeFromIPT(pComputer));
       }
     }
 
@@ -5931,10 +5931,10 @@ void CWsDeployFileInfo::unlockEnvironment(IEspContext* context, IConstWsDeployRe
       ForEach (*iter)
       {
         IPropertyTree* pComputer = &iter->query();
-        xpath.clear().appendf( XML_TAG_COMPUTER "[" XML_ATTR_NETADDRESS "='%s']", pComputer->queryProp(XML_ATTR_NETADDRESS));
+        xpath.clear().appendf(XML_TAG_COMPUTER "[" XML_ATTR_NETADDRESS "='%s']", pComputer->queryProp(XML_ATTR_NETADDRESS));
 
         if (!pComputers->queryPropTree(xpath.str()))
-          unlockComputers->addPropTree( XML_TAG_COMPUTER , createPTreeFromIPT(pComputer));
+          unlockComputers->addPropTree(XML_TAG_COMPUTER, createPTreeFromIPT(pComputer));
       }
     }
 
@@ -5955,7 +5955,7 @@ void CWsDeployFileInfo::unlockEnvironment(IEspContext* context, IConstWsDeployRe
       ForEach (*iter)
       {
         IPropertyTree* pComputer = &iter->query();
-        xpath.clear().appendf( XML_TAG_COMPUTER "[" XML_ATTR_NETADDRESS "='%s']", pComputer->queryProp(XML_ATTR_NETADDRESS));
+        xpath.clear().appendf(XML_TAG_COMPUTER "[" XML_ATTR_NETADDRESS "='%s']", pComputer->queryProp(XML_ATTR_NETADDRESS));
 
         IPropertyTree* pDelComputer = m_lockedNodesBeforeEnv->queryPropTree(xpath.str());
         m_lockedNodesBeforeEnv->removeTree(pDelComputer);
@@ -6040,7 +6040,7 @@ void CWsDeployFileInfo::checkForRefresh(IEspContext &context, IConstWsDeployReqI
 IPropertyTree* CWsDeployFileInfo::queryComputersForCloud()
 {
   Owned<IPropertyTree> pEnvTree = m_Environment?&m_Environment->getPTree():&m_constEnvRdOnly->getPTree();
-  return pEnvTree->queryPropTree( XML_TAG_HARDWARE );
+  return pEnvTree->queryPropTree(XML_TAG_HARDWARE);
 }
 
 void CCloudTaskThread::main()
@@ -6269,7 +6269,7 @@ void CWsDeployFileInfo::initFileInfo(bool createOrOverwrite, bool bClearEnv)
         try
         {
           Owned<IPropertyTree> pDefBldSet = m_pService->m_pConfigHelper->getBuildSetTree(); //createPTreeFromXMLFile( m_pService->m_pConfigHelper->getBuildSetFilePath() );
-          pNewTree->addPropTree( XML_TAG_PROGRAMS , createPTreeFromIPT(pDefBldSet->queryPropTree("./Programs")));
+          pNewTree->addPropTree(XML_TAG_PROGRAMS, createPTreeFromIPT(pDefBldSet->queryPropTree("./Programs")));
           pNewTree->addPropTree(XML_TAG_SOFTWARE, createPTreeFromIPT(pDefBldSet->queryPropTree("./Software")));
         }
         catch(IException* e)
@@ -6283,10 +6283,10 @@ void CWsDeployFileInfo::initFileInfo(bool createOrOverwrite, bool bClearEnv)
       pNewTree->addPropTree(XML_TAG_SOFTWARE, createPTree());
       pNewTree->addPropTree("./Software/Directories", createPTreeFromXMLString(DEFAULT_DIRECTORIES));
     }
-    pNewTree->addPropTree( XML_TAG_HARDWARE , createPTree());
+    pNewTree->addPropTree(XML_TAG_HARDWARE, createPTree());
 
-    if (!pNewTree->queryPropTree( XML_TAG_PROGRAMS ))
-      pNewTree->addPropTree( XML_TAG_PROGRAMS , createPTree());
+    if (!pNewTree->queryPropTree(XML_TAG_PROGRAMS))
+      pNewTree->addPropTree(XML_TAG_PROGRAMS, createPTree());
 
     toXML(pNewTree, s.clear());
     sbxml.clear().append(s);
@@ -7339,7 +7339,7 @@ bool CWsDeployFileInfo::checkForRequiredComponents(IPropertyTree* pEnvRoot, cons
       if (autoadd)
       {
         StringBuffer sb, sbl, compName, nodeName;
-        xpath.clear().appendf("./%s/%s[%s=\"%s\"]",  XML_TAG_HARDWARE ,  XML_TAG_COMPUTER ,
+        xpath.clear().appendf("./%s/%s[%s=\"%s\"]", XML_TAG_HARDWARE, XML_TAG_COMPUTER,
           XML_ATTR_NETADDRESS, ip);
         IPropertyTree* computer = pEnvRoot->queryPropTree(xpath.str());
 

esp/services/WsDeploy/WsDeployService.hpp

@@ -678,7 +678,7 @@ public:
                     throw makeOsException(-1, "Unfinished threads detected!");
             }
 
-            Owned<IPropertyTreeIterator> iter = pComputers->getElements( XML_TAG_COMPUTER );
+            Owned<IPropertyTreeIterator> iter = pComputers->getElements(XML_TAG_COMPUTER);
             StringBuffer localip;
             queryHostIP().getIpText(localip);
 

roxie/roxiemem/roxiemem.cpp

@@ -2252,7 +2252,7 @@ public:
     unsigned releasePage(Heaplet * finger)
     {
         if (memTraceLevel >= 3)
-            logctx.CTXLOG("RoxieMemMgr: CChunkingRowManager::pages() freeing Heaplet linked in active list - addr=%p pages=%u capacity=%"I64F"u rowMgr=%p",
+            logctx.CTXLOG("RoxieMemMgr: CChunkingRowManager::pages() freeing Heaplet linked in active list - addr=%p pages=%u capacity=%" I64F "u rowMgr=%p",
                     finger, finger->sizeInPages(), (unsigned __int64) finger->_capacity(), this);
 
         removeHeaplet(finger);