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

Timestamp:

Nov 19, 2005, 12:16:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind sweep

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (4 diffs)
• shell_command.h (modified) (2 diffs)
• shell_command_class.cc (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -42 +42 @@
   this->description = NULL;
   this->alias = NULL;
+  this->executor = executor.clone();
 
 //  this->classID = classID;
@@ -47 +48 @@
   if (this->shellClass != NULL)
     this->shellClass->commandList->add(this);
-  // handling parameters, and storing them:
-  if (paramCount > FUNCTOR_MAX_ARGUMENTS)
-    paramCount = FUNCTOR_MAX_ARGUMENTS;
-  this->paramCount = paramCount;
-  this->parameters = new unsigned int[paramCount];
-  this->defaultValue = new MultiType[paramCount];
-
-  this->executor = executor.clone();
 }
 
@@ -62 +55 @@
 ShellCommand::~ShellCommand()
 {
-  delete[] this->parameters;
-  delete[] this->defaultValue;
   if (this->alias != NULL && ShellCommandClass::aliasList != NULL)
   {
@@ -369 +360 @@
     while(elem != NULL)
     {
-      PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
-      for (unsigned int i = 0; i< elem->paramCount; i++)
-       printf("%s ", ShellCommand::paramToString(elem->parameters[i]));
+      PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->executor->getParamCount());
+      /// FIXME
+      /*      for (unsigned int i = 0; i< elem->paramCount; i++)
+       printf("%s ", ShellCommand::paramToString(elem->parameters[i]));*/
       if (elem->description != NULL)
        printf("- %s", elem->description);

trunk/src/lib/shell/shell_command.h

@@ -86 +86 @@
 
   protected:
-    unsigned int                     paramCount;                           //!< the count of parameters.
-    unsigned int*                    parameters;                           //!< Parameters the function of this Command takes.
     MultiType*                       defaultValue;                         //!< Default Values.
 
@@ -95 +93 @@
 
     const char*                      description;                          //!< A description for this commnand. (initially NULL). Assigned with (create)->describe("blablabla");
-    Executor*                        executor;
+    Executor*                        executor;                             //!< The Executor, that really executes the Function.
 
 };

trunk/src/lib/shell/shell_command_class.cc

@@ -238 +238 @@
         while(elem != NULL)
         {
-          PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
-          for (unsigned int i = 0; i< elem->paramCount; i++)
-            PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));
+          PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->executor->getParamCount());
+          /// FIXME
+          /*          for (unsigned int i = 0; i< elem->paramCount; i++)
+            PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));*/
           if (elem->description != NULL)
             PRINT(0)("- %s", elem->description);