Changeset 2702 in orxonox.OLD for orxonox

Timestamp:

Nov 2, 2004, 9:15:50 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: corrected a bug in DataTank

File:

• orxonox/branches/chris/src/data_tank.cc (modified) (5 diffs)

orxonox/branches/chris/src/data_tank.cc

@@ -24 +24 @@
 */
 
-#include "datatank.h"
+#include "data_tank.h"
 
 using namespace std;
@@ -345 +345 @@
 {
         FILE* out;
-        DataTree* act;
         
         out = fopen( filename, "w");
@@ -403 +402 @@
         int type = 0;
         char testfile[MAX_FILENAME_LENGHT];
-        
+
         if( !postfix || !lfunc || !ffunc || !placeholderfile) return -1;
-        
+
         sprintf( testfile, "blabla.%s", postfix);
         if( (type = get_type( testfile)) != -1)
@@ -420 +419 @@
         char** old_postfixes = postfixes;
         void** old_placeholders = placeholders;
-        
+
         // realloc
         load_funcs = (void*(**)(char*)) malloc( sizeof( void*(*)(char*)) * (ntypes + 1));
         free_funcs = (void(**)(void*)) malloc( sizeof( void(*)(void*)) * (ntypes + 1));
-        postfixes = (char**) malloc( sizeof( char*) * POSTFIX_LENGHT * (ntypes + 1));
+        postfixes = (char**) malloc( sizeof( char*) * (ntypes + 1));
         placeholders = (void**) malloc( sizeof( void*) * (ntypes + 1));
         
         // copy
         memcpy( load_funcs, old_load_funcs, sizeof( void*(*)(char*)) * ntypes);
-        memcpy( free_funcs, old_free_funcs, sizeof( void*(*)(void*)) * ntypes);
-        memcpy( postfixes, old_postfixes, sizeof( char*) * POSTFIX_LENGHT * ntypes);
+        memcpy( free_funcs, old_free_funcs, sizeof( void(*)(void*)) * ntypes);
+        memcpy( postfixes, old_postfixes, sizeof( char*) * ntypes);
         memcpy( placeholders, old_placeholders, sizeof( void*) * ntypes);
+        
+        // free
+        free( old_load_funcs);
+        free( old_free_funcs);
+        free( old_postfixes);
+        free( old_placeholders);
         
         // add
@@ -439 +444 @@
         load_funcs[type] = lfunc;
         free_funcs[type] = ffunc;
-        memset( postfixes[type], 0, 5);
-        strncpy( postfixes[type], postfix, 5);
+        postfixes[type] = (char*) malloc( sizeof( char) * POSTFIX_LENGHT);
+        memset( postfixes[type], 0, POSTFIX_LENGHT);
+        strncpy( postfixes[type], postfix, POSTFIX_LENGHT);
         placeholders[type] = lfunc( placeholderfile);