Changeset 5938 in orxonox.OLD for trunk/src

Timestamp:

Dec 6, 2005, 7:01:46 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ini_parser and gui clean-up, do not know if this fixed the Problem

Location:

trunk/src/lib

Files:

• gui/gtk_gui/gui_exec.cc (modified) (4 diffs)
• util/ini_parser.cc (modified) (5 diffs)

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

@@ -274 +274 @@
     printf("GROUP:::%s\n", groupName);
     if((groupWidget = locateGroup(widget, groupName, 1))==NULL)
-    {
-      PRINTF(2)("!!There is no group called %s in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n", groupName);
-      groupWidget = widget;
-      continue;
-    }
+      {
+        PRINTF(2)("!!There is no group called %s in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n", groupName);
+        groupWidget = widget;
+        continue;
+      }
     else
-      PRINT(0)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
+      PRINT(4)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
 
     const char* entryName;
@@ -286 +286 @@
     while(entryName = iniParser.getCurrentName())
     {
-      printf("ENTRY:::%s = %s\n", entryName, iniParser.getCurrentValue());
+      PRINTF(4)("ENTRY:::%s = %s\n", entryName, iniParser.getCurrentValue());
       varInfo.variableName = entryName;
       varInfo.variableValue = iniParser.getCurrentValue();
@@ -306 +306 @@
 {
   VarInfo* info =(VarInfo*)varInfo;
+  if (info == NULL || info->variableName == NULL)
+    return;
+
   if(widget->title && !strcmp(widget->title, info->variableName))
     {
       PRINT(5)("Located Option %s.\n", widget->title);
       if(widget->optionType > GUI_NOTHING)
-        static_cast<Option*>(widget)->load(info->variableValue);
+        if (info->variableValue != NULL)
+          static_cast<Option*>(widget)->load(info->variableValue);
     }
 }
@@ -326 +330 @@
 {
   Widget* tmp;
+  if (widget  == NULL || groupName == NULL)
+    return NULL;
 
   if(widget->optionType < GUI_NOTHING)
     {
-      if(static_cast<Packer*>(widget)->getGroupName() &&
+      if(static_cast<Packer*>(widget)->getGroupName() != NULL &&
          !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
-        {
-          return widget;
-        }
+        return widget;
       else
         {
-          if((tmp = locateGroup(static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
+          if((tmp = locateGroup(static_cast<Packer*>(widget)->down,
+                                groupName, depth+1)) != NULL)
             return tmp;
         }

trunk/src/lib/util/ini_parser.cc

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+
+#if HAVE_CONFIG_H 
+#include <config.h> 
+#endif
 
 #ifdef DEBUG
@@ -86 +90 @@
  * @brief sets the Name of the input-file
  * @param fileName The new FileName to set to the IniParser
- * IF fileName is NULL the new Name will be set to NULL too.
+ * If fileName is NULL the new Name will be set to NULL too.
  */
 void IniParser::setFileName(const char* fileName)
@@ -92 +96 @@
   if (this->fileName)
     delete []this->fileName;
-  if (fileName)
+  if (fileName != NULL)
   {
     this->fileName = new char[strlen(fileName)+1];
@@ -358 +362 @@
   {
     (*section).entries.push_back(IniEntry());
-    (*section).entries.back().name = new char[strlen (entryName)+1];
+    (*section).entries.back().name = new char[strlen(entryName)+1];
     strcpy((*section).entries.back().name, entryName);
     (*section).entries.back().value = new char[strlen(value)+1];
@@ -479 +483 @@
     PRINTF(1)("no opened ini-file.\n");
 }
+
+