Changeset 4220 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

May 18, 2005, 11:01:59 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: TrackManager prepared for loading. added new overloaded functions that read in join and fork from one single string
thanks to chris, this was pretty easy… the hard part was finding the substring class

Location:

orxonox/trunk/src/lib/util

Files:

• substring.cc (modified) (4 diffs)
• substring.h (modified) (2 diffs)

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

@@ -22 +22 @@
 #include "substring.h"
 
+#include <string.h>
+#include <assert.h>
+
 SubString::SubString( const char* string)
 {
-        n = 0;
+  n = 0;
         
-        assert( string != NULL);
+  assert( string != NULL);
         
-        for( int i = 0; i < strlen(string); i++) if( string[i] == ',') n++;
+  for( int i = 0; i < strlen(string); i++) if( string[i] == ',') n++;
 
-        n += 1;
+  n += 1;
         
-        strings = new char*[n];
+  strings = new char*[n];
+
+  assert (strings != NULL);
         
-        assert( strings != NULL);
+  int i = 0;
+  int l = 0;
         
-        int i = 0;
-        int l = 0;
+  const char* offset = string;
+  char* end = strchr( string, ',');
+  while( end != NULL)
+    {
+      assert( i < n);
+      l = end - offset;
+      strings[i] = new char[l + 1];
+      assert( strings[i] != NULL);
+      strncpy( strings[i], offset, l);
+      strings[i][l] = 0;
+      i++;
+      end++;
+      offset = end;
+      end = strchr( offset, ',');
+    }
         
-        const char* offset = string;
-        char* end = strchr( string, ',');
-        while( end != NULL)
-        {
-                assert( i < n);
-                l = end - offset;
-                strings[i] = new char[l + 1];
-                assert( strings[i] != NULL);
-                strncpy( strings[i], offset, l);
-                strings[i][l] = 0;
-                i++;
-                end++;
-                offset = end;
-                end = strchr( offset, ',');
-        }
-        
-        strings[i] = new char[l + 1];
-        l = strlen( offset);
-        strncpy( strings[i], offset, l);
-        strings[i][l] = 0;
+  strings[i] = new char[l + 1];
+  l = strlen( offset);
+  strncpy( strings[i], offset, l);
+  strings[i][l] = 0;
 }
 
@@ -66 +69 @@
 SubString::~SubString()
 {
-        for( int i = 0; i < n; i++)
-        {
-                delete strings[i];
-        }
+  for( int i = 0; i < n; i++)
+    {
+      delete strings[i];
+    }
         
-        delete strings;
+  delete strings;
 }
 
@@ -78 +81 @@
    \returns the amount of substrings
 */
-int SubString::getN()
+int SubString::getCount()
 {
-        return n;
+  return n;
 }
 
@@ -90 +93 @@
 const char* SubString::getString( int i)
 {
-        if( i < n && i >= 0) return strings[i];
-        else return NULL;
+  if( i < n && i >= 0) return strings[i];
+  else return NULL;
 }

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

@@ -1 +1 @@
 /*! 
-    \file substring.h
-    \brief a small class to get the parts of a string separated by commas
+  \file substring.h
+  \brief a small class to get the parts of a string separated by commas
 */
 
@@ -7 +7 @@
 #define _SUBSTRING_H
 
-#include "stdincl.h"
-
 class SubString
 {
-        public:
+ public:
         
-                SubString( const char* string);
-                ~SubString();
+  SubString( const char* string);
+  ~SubString();
                 
-                int getN();
-                const char* getString( int i);
+  int getCount();
+  const char* getString( int i);
                 
-        private:
-                char** strings;
-                int n;
+ private:
+  char** strings;
+  int n;
 };