Changeset 7201 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: no more segfaults

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (5 diffs)
• shell_command.h (modified) (1 diff)

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);