Changeset 7524 for trunk/libtransmission/json.c

Timestamp:

Dec 29, 2008, 8:54:36 AM (12 years ago)

Author:

charles

Message:

(trunk libT) avoid some unnecessary memory fragmentation... for composited objects that have a tr_ptrArray, contain the tr_ptrArray directly rather than a pointer to one allocated elsewhere on the heap.

File:

• trunk/libtransmission/json.c (modified) (6 diffs)

trunk/libtransmission/json.c

@@ -30 +30 @@
 {
     tr_benc *      top;
-    tr_ptrArray *  stack;
+    tr_ptrArray    stack;
     char *         key;
 };
@@ -40 +40 @@
     tr_benc * node = NULL;
 
-    if( tr_ptrArrayEmpty( data->stack ) )
+    if( tr_ptrArrayEmpty( &data->stack ) )
         parent = NULL;
     else
-        parent = tr_ptrArrayBack( data->stack );
+        parent = tr_ptrArrayBack( &data->stack );
 
     if( !parent )
@@ -72 +72 @@
             node = getNode( data );
             tr_bencInitList( node, 0 );
-            tr_ptrArrayAppend( data->stack, node );
+            tr_ptrArrayAppend( &data->stack, node );
             break;
 
         case JSON_T_ARRAY_END:
-            tr_ptrArrayPop( data->stack );
+            tr_ptrArrayPop( &data->stack );
             break;
 
@@ -82 +82 @@
             node = getNode( data );
             tr_bencInitDict( node, 0 );
-            tr_ptrArrayAppend( data->stack, node );
+            tr_ptrArrayAppend( &data->stack, node );
             break;
 
         case JSON_T_OBJECT_END:
-            tr_ptrArrayPop( data->stack );
+            tr_ptrArrayPop( &data->stack );
             break;
 
@@ -149 +149 @@
     data.key = NULL;
     data.top = setme_benc;
-    data.stack = tr_ptrArrayNew( );
+    data.stack = TR_PTR_ARRAY_INIT;
 
     checker = new_JSON_parser( &config );
@@ -162 +162 @@
 
     delete_JSON_parser( checker );
-    tr_ptrArrayFree( data.stack, NULL );
+    tr_ptrArrayDestruct( &data.stack, NULL );
     return err;
 }