Changeset 2746

Timestamp:

Aug 14, 2007, 2:18:54 PM (15 years ago)

Author:

charles

Message:

make list less error-prone by changing the API s.t. we're guaranteed to update the list's pointer correctly.

Location:

trunk/libtransmission

Files:

• list.c (modified) (2 diffs)
• list.h (modified) (1 diff)
• peer.c (modified) (1 diff)
• peermessages.h (modified) (2 diffs)
• peerparse.h (modified) (2 diffs)
• transmission.c (modified) (2 diffs)

trunk/libtransmission/list.c

@@ -30 +30 @@
 
 void
-tr_list_free( tr_list_t* list )
+tr_list_free( tr_list_t** list )
 {
-    while( list )
+    while( *list )
     {
-        tr_list_t * node = list;
-        list = list->next;
+        tr_list_t * node = *list;
+        *list = (*list)->next;
         node_free( node );
     }
 }
 
-tr_list_t*
-tr_list_prepend( tr_list_t * list, void * data )
+void
+tr_list_prepend( tr_list_t ** list, void * data )
 {
     tr_list_t * node = node_alloc ();
     node->data = data;
-    node->next = list;
-    if( list )
-        list->prev = node;
-    return node;
+    node->next = *list;
+    if( *list )
+        (*list)->prev = node;
+    *list = node;
 }
 
-tr_list_t*
-tr_list_append( tr_list_t * list, void * data )
+void
+tr_list_append( tr_list_t ** list, void * data )
 {
     tr_list_t * node = node_alloc( );
     node->data = data;
-    if( !list )
-        return node;
+    if( !*list )
+        *list = node;
     else {
-        tr_list_t * l = list;
+        tr_list_t * l = *list;
         while( l->next )
             l = l->next;
         l->next = node;
         node->prev = l;
-        return list;
     }
 }
+
+void
+tr_list_insert_sorted( tr_list_t ** list,
+                       void       * data,
+                       int          compare(const void*,const void*) )
+{
+    /* find l, the node that we'll insert this data before */
+    tr_list_t * l;
+    for( l=*list; l!=NULL; l=l->next ) {
+        const int c = (compare)( data, l->data );
+        if( c <= 0 )
+            break;
+    }
+
+    if( l == NULL)
+        tr_list_append( list, data );
+    else if( l == *list )
+        tr_list_prepend( list, data );
+    else {
+        tr_list_t * node = node_alloc( );
+        node->data = data;
+        if( l->prev ) { node->prev = l->prev; node->prev->next = node; }
+        node->next = l;
+        l->prev = node;
+    }
+}
+
 
 tr_list_t*
@@ -78 +104 @@
 }
 
-tr_list_t*
-tr_list_remove_data ( tr_list_t * list, const void * data )
+void
+tr_list_remove_data ( tr_list_t ** list, const void * data )
 {
-    tr_list_t * node = tr_list_find_data( list, data );
+    tr_list_t * node = tr_list_find_data( *list, data );
     tr_list_t * prev = node ? node->prev : NULL;
     tr_list_t * next = node ? node->next : NULL;
     if( prev ) prev->next = next;
     if( next ) next->prev = prev;
-    if( list == node ) list = next;
+    if( *list == node ) *list = next;
     node_free( node );
-    return list;
 }
 
 tr_list_t*
-tr_list_find ( tr_list_t * list , TrListCompareFunc func, const void * b )
+tr_list_find ( tr_list_t * list , const void * b, TrListCompareFunc func )
 {
     for( ; list; list=list->next )

trunk/libtransmission/list.h

@@ -20 +20 @@
 tr_list_t;
 
-void        tr_list_free        ( tr_list_t* );
-tr_list_t*  tr_list_append      ( tr_list_t*, void * data );
-tr_list_t*  tr_list_prepend     ( tr_list_t*, void * data );
-tr_list_t*  tr_list_remove_data ( tr_list_t*, const void * data );
+typedef int (*TrListCompareFunc)(const void * a, const void * b);
+typedef void (*TrListForeachFunc)(void *);
 
-typedef int (*TrListCompareFunc)(const void * a, const void * b);
-tr_list_t*  tr_list_find        ( tr_list_t*, TrListCompareFunc func, const void * b );
-tr_list_t*  tr_list_find_data   ( tr_list_t*, const void * data );
+void        tr_list_free           ( tr_list_t         ** list );
 
-typedef void (*TrListForeachFunc)(void *);
-void tr_list_foreach            ( tr_list_t*, TrListForeachFunc func );
+void        tr_list_append         ( tr_list_t         ** list,
+                                     void               * data );
+
+void        tr_list_prepend        ( tr_list_t         ** list,
+                                     void               * data );
+
+void        tr_list_remove_data    ( tr_list_t         ** list,
+                                     const void         * data );
+
+void        tr_list_insert_sorted  ( tr_list_t         ** list,
+                                     void               * data,
+                                     TrListCompareFunc    compare_func );
+
+tr_list_t*  tr_list_find           ( tr_list_t          * list,
+                                     const void         * b,
+                                     TrListCompareFunc    compare_func );
+
+tr_list_t*  tr_list_find_data      ( tr_list_t          * list,
+                                     const void         * data );
+
+void        tr_list_foreach        ( tr_list_t          * list,
+                                     TrListForeachFunc    foreach_func );
 
 #endif /* TR_LIST_H */

trunk/libtransmission/peer.c

@@ -314 +314 @@
     tr_bitfieldFree( peer->reqfield );
     tr_list_foreach( peer->outRequests, tr_free );
-    tr_list_free( peer->outRequests );
+    tr_list_free( &peer->outRequests );
     tr_free( peer->inRequests );
     tr_free( peer->buf );

trunk/libtransmission/peermessages.h

@@ -124 +124 @@
         r = (tr_request_t*) peer->outRequests->data;
         assert( r != NULL );
-        peer->outRequests = tr_list_remove_data( peer->outRequests, r );
+        tr_list_remove_data( &peer->outRequests, r );
 
         if( !tr_cpPieceIsComplete( tor->completion, r->index ) ) /* sanity clause */
@@ -227 +227 @@
         /* Drop older requests from the last time it was unchoked, if any */
         tr_list_foreach( peer->outRequests, tr_free );
-        tr_list_free( peer->outRequests );
+        tr_list_free( &peer->outRequests );
         peer->outRequests = NULL;
     }

trunk/libtransmission/peerparse.h

@@ -245 +245 @@
     r->begin = begin;
     r->length = length;
-    peer->outRequests = tr_list_append( peer->outRequests, r );
+    tr_list_append( &peer->outRequests, r );
 
     return TR_OK;
@@ -419 +419 @@
     req.begin = begin;
     req.length = length;
-    while(( l = tr_list_find( peer->outRequests, reqCompare, &req ) )) {
+    while(( l = tr_list_find( peer->outRequests, &req, reqCompare ) )) {
         tr_request_t * r = (tr_request_t *) l->data;
-        peer->outRequests = tr_list_remove_data( peer->outRequests, r );
+        tr_list_remove_data( &peer->outRequests, r );
         tr_free( r );
     }

trunk/libtransmission/transmission.c

@@ -271 +271 @@
                 tor = tr_torrentInit( h, path, destination, flags, NULL );
                 if( tor != NULL ) {
-                    list = tr_list_append( list, tor );
+                    tr_list_append( &list, tor );
                     //fprintf (stderr, "#%d - %s\n", n, tor->info.name );
                     n++;
@@ -285 +285 @@
     assert( i==n );
 
-    tr_list_free( list );
+    tr_list_free( &list );
 
     *setmeCount = n;