Changeset 129 for abuse/trunk/src/config.cppTweet

Timestamp:

Mar 22, 2008, 10:39:25 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Get rid of jmalloc and replace it with standard malloc. Modern operating systems certainly perform a lot better than this custom implementation, and we have superior tools (eg. valgrind) to debug and profile memory usage without interfering with the code itself.

File:

• abuse/trunk/src/config.cpp (modified) (4 diffs)

abuse/trunk/src/config.cpp

@@ -93 +93 @@
     if( key_map )
     {
-        jfree( key_map );
+        free( key_map );
     }
     key_map = NULL;
@@ -100 +100 @@
     if( key_players )
     {
-        key_map = ( player_keys *)jmalloc(sizeof(player_keys)*key_players,"key bindings");
+        key_map = ( player_keys *)malloc(sizeof(player_keys)*key_players);
         for( int i = 0; i < key_players; i++ )
         {
@@ -128 +128 @@
     if( key_map )
     {
-        jfree( key_map );
+        free( key_map );
     }
     key_map = NULL;
 
     key_players = 1;
-    key_map = (player_keys *)jmalloc( sizeof( player_keys ) * key_players, "key bindings" );
+    key_map = (player_keys *)malloc( sizeof( player_keys ) * key_players );
     for( int i = 0; i < key_players; i++ )
     {
@@ -224 +224 @@
     if(key_map)
     {
-        jfree(key_map);
+        free(key_map);
         key_map = NULL;
     }