Changeset 5936 in orxonox.OLD for trunk/src

Timestamp:

Dec 6, 2005, 2:12:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some fixes, but still some strange seg-faults in the IniParser/GuiExec-combination

Location:

trunk/src/lib

Files:

• event/key_mapper.cc (modified) (2 diffs)
• gui/gtk_gui/gui_exec.cc (modified) (4 diffs)
• util/ini_parser.cc (modified) (18 diffs)
• util/ini_parser.h (modified) (3 diffs)

trunk/src/lib/event/key_mapper.cc

@@ -132 +132 @@
   int* index;
 
-  iniParser->getFirstVar();
+  iniParser->firstVar();
   while(iniParser->getCurrentName())
   {
@@ -151 +151 @@
   }
 
-  iniParser->getFirstVar();
+  iniParser->firstVar();
   while(iniParser->getCurrentName())
   {

trunk/src/lib/gui/gtk_gui/gui_exec.cc

@@ -254 +254 @@
 
 /**
- *  Reads in Configuration Data.
+ * @brief Reads in Configuration Data.
  * @param widget from which Widget on should be saved.
 */
@@ -265 +265 @@
     return;
 
-  iniParser.getFirstSection();
+  iniParser.firstSection();
   Widget* groupWidget = widget;
   const char* groupName;
@@ -272 +272 @@
   while (groupName = iniParser.getCurrentSection())
   {
+    printf("GROUP:::%s\n", groupName);
     if((groupWidget = locateGroup(widget, groupName, 1))==NULL)
     {
@@ -281 +282 @@
       PRINT(0)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
 
-    iniParser.getFirstVar();
-    while(iniParser.getCurrentName())
-    {
-      varInfo.variableName = iniParser.getCurrentName();
+    const char* entryName;
+    iniParser.firstVar();
+    while(entryName = iniParser.getCurrentName())
+    {
+      printf("ENTRY:::%s = %s\n", entryName, iniParser.getCurrentValue());
+      varInfo.variableName = entryName;
       varInfo.variableValue = iniParser.getCurrentValue();
       groupWidget->walkThrough(this->readFileText, &varInfo, 0);

trunk/src/lib/util/ini_parser.cc

@@ -63 +63 @@
   while(!this->sections.empty())
   {
-    
-    IniSection section = this->sections.front();
+     IniSection section = this->sections.front();
     
     // in all entries of the sections
@@ -79 +78 @@
     this->sections.pop_front();
   }
+  this->currentSection = this->sections.end();
   this->setFileName(NULL);
 }
@@ -196 +196 @@
  * @return true on success false otherwise
  */
-bool IniParser::writeFile(const char* fileName)
+bool IniParser::writeFile(const char* fileName) const
 {
   FILE*    stream;           //!< The stream we use to read the file.
@@ -209 +209 @@
   else
   {
-    std::list<IniSection>::iterator section;
+    std::list<IniSection>::const_iterator section;
     for (section = this->sections.begin(); section != this->sections.end(); section++)
       {
         fprintf(stream, "\n [%s]\n", (*section).name);
         
-        std::list<IniEntry>::iterator entry;
+        std::list<IniEntry>::const_iterator entry;
         for (entry = (*section).entries.begin(); entry != (*section).entries.end(); entry++)
           fprintf(stream, "   %s = %s\n", (*entry).name, (*entry).value);
@@ -238 +238 @@
   this->currentSection = --this->sections.end();
   if (!this->sections.empty())
-    this->currentEntry = (*this->currentSection).entries.begin();
+      this->currentEntry = (*this->currentSection).entries.begin();
   PRINTF(5)("Added Section %s\n", sectionName);
   return true;
@@ -248 +248 @@
  * @param sectionName: the name of the section to set the cursor to
  * @return true on success or false if the section could not be found
-*/
-bool IniParser::getSection( const char* sectionName)
+ */
+bool IniParser::getSection(const char* sectionName)
 {
   std::list<IniSection>::iterator section;
@@ -259 +259 @@
         return true;
       }
-
   return false;
 }
@@ -267 +266 @@
  * @brief moves to the first section
  */
-void IniParser::getFirstSection()
+void IniParser::firstSection()
 {
   this->currentSection = this->sections.begin();
@@ -283 +282 @@
   if (this->currentSection == this->sections.end())
     return NULL;
-  else
-  {
-    this->currentSection++;
-  }
-    if (this->currentSection == this->sections.end())
-      return NULL;
+
+  this->currentSection++;
 
   if (this->currentSection != this->sections.end())
@@ -303 +298 @@
  * @brief moves to the first Variable of the current Section
  */
-void IniParser::getFirstVar()
-{
-  if (this->currentSection != this->sections.end())
+void IniParser::firstVar()
+{
+  if (!this->sections.empty() &&
+      this->currentSection != this->sections.end())
     this->currentEntry = (*this->currentSection).entries.begin();
 }
@@ -342 +338 @@
 {
   std::list<IniSection>::iterator section;
-
+  
   if (sectionName != NULL)
   {
@@ -351 +347 @@
   else
     section = this->currentSection;
+  if (section == this->sections.end())
+    return false;
 
   if (section == this->sections.end())
@@ -364 +362 @@
     (*section).entries.back().value = new char[strlen(value)+1];
     strcpy((*section).entries.back().value, value);
-    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n", entryName, value, (*section).name);
+    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
+              (*section).entries.back().name,
+              (*section).entries.back().value,
+              (*section).name);
     return true;
   }
@@ -387 +388 @@
     if (sectionName != NULL)
       {
-
         for (section = this->sections.begin(); section != this->sections.end(); section++)
           {
@@ -399 +399 @@
     else
       section = this->currentSection;
+    
+   if (section == this->sections.end())
+     return (defaultValue);
 
     std::list<IniEntry>::const_iterator entry;
@@ -420 +423 @@
 const char* IniParser::getCurrentSection() const 
 {
- return (this->currentSection!=NULL) ? 
-   this->currentSection->name :
-   NULL;
+  if (!this->sections.empty() &&
+      this->currentSection != this->sections.end()) 
+    return this->currentSection->name;
+  else
+    return NULL;
  }
 
@@ -432 +437 @@
 {
  if (!this->sections.empty() &&
+     this->currentSection != this->sections.end() &&
      this->currentEntry != (*this->currentSection).entries.end())
    return (*this->currentEntry).name;
@@ -443 +449 @@
 const char* IniParser::getCurrentValue() const 
 {
-  if (!this->sections.empty() 
-      && this->currentEntry != (*this->currentSection).entries.end())
+  if (!this->sections.empty() &&
+      this->currentSection != this->sections.end() &&
+      this->currentEntry != (*this->currentSection).entries.end())
     return (*this->currentEntry).value;
   else

trunk/src/lib/util/ini_parser.h

@@ -43 +43 @@
 
     bool readFile(const char* fileName);
-    bool writeFile(const char* fileName);
+    bool writeFile(const char* fileName) const;
 
     bool addSection(const char* sectionName);
@@ -51 +51 @@
     bool isOpen() const { return (this->fileName != NULL)? true : false; };
 
-    void getFirstSection();
+    void firstSection();
     const char* nextSection();
 
@@ -60 +60 @@
     const char* getVar(const char* entryName, const char* sectionName, const char* defaultValue = "") const;
 
-    void getFirstVar();
+    void firstVar();
     bool nextVar();