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

Timestamp:

Jul 11, 2005, 5:43:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented aim

Location:

orxonox/trunk/src/lib/util

Files:

• substring.cc (modified) (4 diffs)
• substring.h (modified) (1 diff)

orxonox/trunk/src/lib/util/substring.cc

@@ -29 +29 @@
 SubString::SubString( const char* string, char splitter)
 {
-  n = 0;
+  this->splittersCount = 0;
 
   assert( string != NULL);
 
-  for( int i = 0; i < strlen(string); i++) if( string[i] == splitter) n++;
+  for( int i = 0; i < strlen(string); i++) if( string[i] == splitter)
+      splittersCount++;
 
-  n += 1;
+  this->splittersCount += 1;
 
-  strings = new char*[n];
-
+  this->strings = new char*[this->splittersCount];
   assert (strings != NULL);
 
@@ -48 +48 @@
   while( end != NULL)
     {
-      assert( i < n);
+      assert( i < this->splittersCount);
       l = end - offset;
-      strings[i] = new char[l + 1];
+      this->strings[i] = new char[l + 1];
       assert( strings[i] != NULL);
       strncpy( strings[i], offset, l);
@@ -71 +71 @@
 SubString::~SubString()
 {
-  for( int i = 0; i < n; i++)
+  for( int i = 0; i < this->splittersCount; i++)
     {
-      delete strings[i];
+      delete this->strings[i];
     }
 
-  delete strings;
-}
-
-/**
-   \brief get the amount of substrings
-   \returns the amount of substrings
-*/
-int SubString::getCount()
-{
-  return n;
+  delete this->strings;
 }
 
@@ -95 +86 @@
 const char* SubString::getString( int i)
 {
-  if( i < n && i >= 0) return strings[i];
-  else return NULL;
+  if( i < this->splittersCount && i >= 0)
+    return this->strings[i];
+  else
+    return NULL;
 }

orxonox/trunk/src/lib/util/substring.h

@@ -14 +14 @@
   ~SubString();
 
-  int getCount();
+  inline int getCount() { return this->splittersCount; };
   const char* getString( int i);
 
  private:
-  char**     strings;         //!< strings produced from a single string splitted in multiple strings
-  int        n;               //!< how many splitted parts
+  char**     strings;                      //!< strings produced from a single string splitted in multiple strings
+  int        splittersCount;               //!< how many splitted parts
 };