Changeset 5552 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Nov 12, 2005, 1:40:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellCommand now uses MultiType instead of many different strange constellations →
saves space and complexity (a bit complexity at least)

Location:

trunk/src/lib/util

Files:

• multi_type.cc (modified) (2 diffs)
• multi_type.h (modified) (1 diff)

trunk/src/lib/util/multi_type.cc

@@ -30 +30 @@
 MultiType::MultiType()
 {
-  this->type = MT_NULL;
-  this->storedString = NULL;
-}
-
+  this->init();
+}
 /**
  * creates a multiType out of a boolean
@@ -178 +176 @@
   if (this->storedString != NULL)
     delete[] this->storedString;
-  this->storedString = new char[strlen(value)+1];
-  strcpy(storedString, value);
-
-  this->value.String = this->storedString;
+
+  if (value == NULL)
+  {
+    this->storedString = new char[1];
+    this->storedString[0] = '\0';
+    this->value.String = this->storedString;
+    return;
+  }
+  else
+  {
+    this->storedString = new char[strlen(value)+1];
+    strcpy(storedString, value);
+    this->value.String = this->storedString;
+  }
 }
 

trunk/src/lib/util/multi_type.h

@@ -57 +57 @@
     inline MT_Type getType() const { return this->type; };
 
+
+    /* RETRIEVING FUNCTIONS */
     bool getBool() const;
     int getInt() const;