Changeset 7204 in orxonox.OLD for branches/std/src/lib/parser

Timestamp:

Mar 9, 2006, 6:10:22 PM (18 years ago)

Author:

bensch

Message:

small bug… more to come :/

File:

• branches/std/src/lib/parser/ini_parser/ini_parser.cc (modified) (5 diffs)

branches/std/src/lib/parser/ini_parser/ini_parser.cc

@@ -68 +68 @@
 {
   // in all sections
-  while(!this->sections.empty())
-  {
-    IniSection section = this->sections.front();
-
-    // in all entries of the sections
-    while(!section.entries.empty())
-    {
-      // delete all strings of entries.
-      IniEntry entry = section.entries.front();
-      section.entries.pop_front();
-    }
-    // delete all Sections
-    this->sections.pop_front();
-  }
+  this->sections.clear();
+
   this->currentSection = this->sections.end();
   this->setFileName(NULL);
@@ -95 +83 @@
 {
   this->comment = "";
-
-  if (!fileName.empty())
-    this->fileName = fileName;
-  else
-    this->fileName = "";
+  this->fileName = fileName;
 }
 
@@ -118 +102 @@
   if (!this->fileName.empty())
     this->deleteSections();
+
   if( fileName.empty())
     return false;
@@ -151 +136 @@
       if ( (*lineBegin == '#' || *lineBegin == ';'))
       {
-        char* newCommenLine = new char[strlen(lineBegin)+1];
-        strcpy(newCommenLine, lineBegin);
+        string newCommenLine = lineBegin;
         this->commentList.push_back(newCommenLine);
         continue;
@@ -276 +260 @@
   if (!this->sections.empty())
     this->currentEntry = (*this->currentSection).entries.begin();
-  PRINTF(5)("Added Section %s\n", sectionName);
+  PRINTF(5)("Added Section %s\n", sectionName.c_str());
   return true;
 }