Merge pull request #313 from accel-sim/dev

Purdue Updates Merging

1 files changed, 13 insertions, 15 deletions

diff --git a/src/accelwattch/xmlParser.cc b/src/accelwattch/xmlParser.cc
index 8f49b39..780d2ad 100644
--- a/src/accelwattch/xmlParser.cc
+++ b/src/accelwattch/xmlParser.cc
@@ -1236,12 +1236,10 @@ static NextToken GetNextToken(XML *pXML, int *pcbToken,
       // Indicate we are dealing with text
       *pType = eTokenText;
       while ((ch = getNextChar(pXML))) {
-        if
-          XML_isSPACECHAR(ch) {
-            indexStart++;
-            break;
-          }
-        else if (ch == _CXML('/')) {
+        if XML_isSPACECHAR (ch) {
+          indexStart++;
+          break;
+        } else if (ch == _CXML('/')) {
           // If we find a slash then this maybe text or a short hand end tag
           // Peek at the next character to see it we have short hand end tag
           ch = pXML->lpXML[pXML->nIndex];
@@ -2193,15 +2191,15 @@ int XMLNode::CreateXMLStringR(XMLNodeData *pEntry, XMLSTR lpszMarker,
         nResult++;
       }
     } else
-        // If there are child nodes we need to terminate the start tag
-        if (nElementI) {
-      if (lpszMarker) lpszMarker[nResult - 1] = _CXML('>');
-      if (nFormat >= 0) {
-        if (lpszMarker) lpszMarker[nResult] = _CXML('\n');
-        nResult++;
-      }
-    } else
-      nResult--;
+      // If there are child nodes we need to terminate the start tag
+      if (nElementI) {
+        if (lpszMarker) lpszMarker[nResult - 1] = _CXML('>');
+        if (nFormat >= 0) {
+          if (lpszMarker) lpszMarker[nResult] = _CXML('\n');
+          nResult++;
+        }
+      } else
+        nResult--;
   }
 
   // Calculate the child format for when we recurse.  This is used to