merged with trunk

1 files changed, 1 insertions, 27 deletions

diff --git a/muse2/muse/xml.cpp b/muse2/muse/xml.cpp
index 1a989366..6f79c3e6 100644
--- a/muse2/muse/xml.cpp
+++ b/muse2/muse/xml.cpp
@@ -114,11 +114,9 @@ void Xml::nextc()
 
 void Xml::token(int cc)
       {
-      //char buffer[512];
       QByteArray buffer;
 
       int i = 0;
-      //for (; i < 511;) {
       for (; i < 9999999;) {   // Stop at a reasonably large amount 10 million.
             if (c == ' ' || c == '\t' || c == cc || c == '\n' || c == EOF)
                   break;
@@ -136,7 +134,6 @@ void Xml::token(int cc)
 
 void Xml::stoken()
       {
-      //char buffer[1024*4];
       QByteArray buffer;
       
       int i = 0;
@@ -144,7 +141,6 @@ void Xml::stoken()
       ++i;
       next();
 
-      //for (;i < 1024*4-1;) {
       for (;i < 10000000*4-1;) {  // Stop at a reasonably large amount 10 million.
             if (c == '"') {
                   buffer[i++] = c;
@@ -216,8 +212,6 @@ QString Xml::strip(const QString& s)
 
 Xml::Token Xml::parse()
       {
-      //char buffer[1024*1024];   // increase buffer -rj
-      //char* p;
       QByteArray buffer;
       int idx = 0;
 
@@ -273,21 +267,17 @@ Xml::Token Xml::parse()
                   }
             if (c == '?') {
                   next();
-                  //p = buffer;
-                  //p = buffer.data();
                   idx = 0;
                   for (;;) {
                         if (c == '?' || c == EOF || c == '>')
                               break;
                         
-                        //*p++ = c;
                         buffer[idx++] = c;
                         
                         // TODO: check overflow
                         next();
                         }
                   
-                  //*p = 0;
                   buffer[idx] = 0;
                   
                   _s1 = QString(buffer);
@@ -317,21 +307,17 @@ Xml::Token Xml::parse()
                         }
                   goto again;
                   }
-            //p = buffer;
-            //p = buffer.data();
             idx = 0;
             for (;;) {
                   if (c == '/' || c == ' ' || c == '\t' || c == '>' || c == '\n' || c == EOF)
                         break;
                   // TODO: check overflow
                   
-                  //*p++ = c;
                   buffer[idx++] = c;
                   
                   next();
                   }
             
-            //*p = 0;
             buffer[idx] = 0;
             
             _s1 = QString(buffer);
@@ -382,8 +368,6 @@ Xml::Token Xml::parse()
                   fprintf(stderr, "XML: level = 0\n");
                   goto error;
                   }
-            //p = buffer;
-            //p = buffer.data();
             idx = 0;
             for (;;) {
                   if (c == EOF || c == '<')
@@ -391,32 +375,24 @@ Xml::Token Xml::parse()
                   if (c == '&') {
                         next();
                         if (c == '<') {         // be tolerant with old muse files
-                              
-                              //*p++ = '&';
                               buffer[idx++] = '&';
                               
                               continue;
                               }
                               
-                        //char name[32];
-                        //char* dp = name;
                         QByteArray name;
                         int name_idx = 0;
                         
-                        //*dp++ = c;
                         name[name_idx++] = c;
                         
-                        //for (; dp-name < 31;) {
                         for (; name_idx < 9999999;) {   // Stop at a reasonably large amount 10 million.
                               next();
                               if (c == ';')
                                     break;
                               
-                              //*dp++ = c;
                               name[name_idx++] = c;
                               }
                               
-                        //*dp = 0;
                         name[name_idx] = 0;
                         
                         if (strcmp(name, "lt") == 0)
@@ -432,14 +408,12 @@ Xml::Token Xml::parse()
                         else
                               c = '?';
                         }
-                        
-                  //*p++ = c;
+
                   buffer[idx++] = c;
                   
                   next();
                   }
                   
-            //*p = 0;
             buffer[idx] = 0;
             
             _s1 = QString(buffer);