Changeset 7201 in orxonox.OLD

Timestamp:

Mar 9, 2006, 12:51:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: no more segfaults

Location:

trunk/src/lib

Files:

• shell/shell_command.cc (modified) (5 diffs)
• shell/shell_command.h (modified) (1 diff)
• util/executor/executor.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (1 diff)
• util/multi_type.cc (modified) (2 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -44 +44 @@
   this->alias = NULL;
   this->executor = executor.clone();
+  this->executor->setName(commandName);
 
 //  this->classID = classID;
@@ -69 +70 @@
 ShellCommand* ShellCommand::registerCommand(const char* commandName, const char* className, const Executor& executor)
 {
-  if (ShellCommand::isRegistered(commandName, className, executor))
+  if (ShellCommand::isRegistered(commandName, className))
     return NULL;
   else
@@ -114 +115 @@
  * @param commandName the name of the Command
  * @param className the name of the Class the command should apply to.
- * @param paramCount how many arguments the Command takes
  * @returns true, if the command is registered/false otherwise
  *
@@ -120 +120 @@
  * This is checked in the registerCommand-function.
  */
-bool ShellCommand::isRegistered(const char* commandName, const char* className, const Executor& executor)
+bool ShellCommand::isRegistered(const char* commandName, const char* className)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -304 +304 @@
                                           const MultiType& value4)
 {
-  if (this == NULL)
+  if (this == NULL || this->executor == NULL)
     return NULL;
 

trunk/src/lib/shell/shell_command.h

@@ -79 +79 @@
     ~ShellCommand();
 
-    static bool isRegistered(const char* commandName, const char* className, const Executor& executor);
+    static bool isRegistered(const char* commandName, const char* className);
     static const char* paramToString(long parameter);
 

trunk/src/lib/util/executor/executor.cc

@@ -105 +105 @@
   value[4] = &value4;
 
+  printf("%s ::: paramCount: %d\n", this->getName(), this->paramCount);
   for (unsigned int i = 0; i < this->paramCount; i++)
   {
     if (*value[i] != MT_NULL)
     {
-     // printf("1:::: %s\n", MultiType::MultiTypeToString(this->defaultValue[i].getType()));
-      //this->defaultValue[i].debug();
-      this->defaultValue[i].setValueOf(*value[i]);
+      printf("1:::: %d : %s \n",i, MultiType::MultiTypeToString(this->defaultValue[i].getType()));
+
+      this->defaultValue[i].debug();
+      //this->defaultValue[i].setValueOf(*value[i]);
       //printf("2::::%s\n", MultiType::MultiTypeToString(this->defaultValue[i].getType()));
       //this->defaultValue[i].debug();

trunk/src/lib/util/loading/load_param.cc

@@ -45 +45 @@
   // set the Executor.
   this->executor = executor.clone();
+
+  if (this->executor)
+    this->executor->setName(paramName);
 }
 

trunk/src/lib/util/multi_type.cc

@@ -50 +50 @@
     case MT_CHAR:
       this->value.Char = '\0';
+      break;
+    case MT_STRING:
+      this->storedString = "";
       break;
   }
@@ -299 +302 @@
   else if (this->type & MT_STRING)
   {
+    if (this->storedString == "") return 0;
     char* endPtr = NULL;
     int result = strtol(this->storedString.c_str(), &endPtr, 10);