Changeset 3105 for trunk/libtransmission/ptrarray.c

Timestamp:

Sep 20, 2007, 4:32:01 PM (14 years ago)

Author:

livings124

Message:

merge encryption branch to trunk (xcode project is still out of date)

File:

• trunk/libtransmission/ptrarray.c (modified) (15 diffs)

trunk/libtransmission/ptrarray.c

@@ -20 +20 @@
 #define GROW 32
 
-struct tr_ptrArray_s
+struct tr_ptrArray
 {
     void ** items;
@@ -27 +27 @@
 };
 
-tr_ptrArray_t*
+tr_ptrArray*
 tr_ptrArrayNew( void )
 {
-    tr_ptrArray_t * p;
+    tr_ptrArray * p;
 
-    p = tr_new( tr_ptrArray_t, 1 );
+    p = tr_new( tr_ptrArray, 1 );
     p->n_items = 0;
     p->n_alloc = GROW;
@@ -41 +41 @@
 
 void
-tr_ptrArrayFree( tr_ptrArray_t * t )
+tr_ptrArrayFree( tr_ptrArray * t )
 {
     assert( t != NULL );
@@ -51 +51 @@
 
 void**
-tr_ptrArrayPeek( tr_ptrArray_t * t, int * size )
+tr_ptrArrayPeek( tr_ptrArray * t, int * size )
 {
     *size = t->n_items;
@@ -57 +57 @@
 }
 
+void*
+tr_ptrArrayNth( tr_ptrArray* t, int i )
+{
+    assert( t != NULL  );
+    assert( i >= 0 );
+    assert( i < t->n_items );
+
+    return t->items[i];
+}
+
 int
-tr_ptrArraySize( const tr_ptrArray_t * t )
+tr_ptrArraySize( const tr_ptrArray * t )
 {
     return t->n_items;
@@ -64 +74 @@
 
 int
-tr_ptrArrayEmpty( const tr_ptrArray_t * t )
+tr_ptrArrayEmpty( const tr_ptrArray * t )
 {
     return t->n_items == 0;
@@ -70 +80 @@
 
 void
-tr_ptrArrayClear( tr_ptrArray_t * t )
+tr_ptrArrayClear( tr_ptrArray * t )
 {
     t->n_items = 0;
@@ -76 +86 @@
 
 int
-tr_ptrArrayInsert( tr_ptrArray_t * t, void * ptr, int pos )
+tr_ptrArrayInsert( tr_ptrArray * t, void * ptr, int pos )
 {
     if( pos<0 || pos>t->n_items )
@@ -96 +106 @@
 
 int
-tr_ptrArrayAppend( tr_ptrArray_t * t, void * ptr )
+tr_ptrArrayAppend( tr_ptrArray * t, void * ptr )
 {
     return tr_ptrArrayInsert( t, ptr, -1 );
@@ -102 +112 @@
 
 void
-tr_ptrArrayErase( tr_ptrArray_t * t, int begin, int end )
+tr_ptrArrayErase( tr_ptrArray * t, int begin, int end )
 {
     assert( begin >= 0 );
@@ -121 +131 @@
 
 int
-tr_ptrArrayLowerBound( const tr_ptrArray_t * t,
-                       void                * ptr,
-                       int                   compare( const void *,const void * ),
-                       int                 * exact_match )
+tr_ptrArrayLowerBound( const tr_ptrArray * t,
+                       const void        * ptr,
+                       int                 compare( const void *,const void * ),
+                       int               * exact_match )
 {
-    int c = -1;
     int len = t->n_items;
     int first = 0;
@@ -134 +143 @@
         int half = len / 2;
         int middle = first + half;
-        c = compare( t->items[middle], ptr );
+        const int c = compare( t->items[middle], ptr );
         if( c < 0 ) {
             first = middle + 1;
@@ -155 +164 @@
 
 int
-tr_ptrArrayInsertSorted( tr_ptrArray_t  * t,
-                         void           * ptr,
-                         int              compare(const void*,const void*) )
+tr_ptrArrayInsertSorted( tr_ptrArray  * t,
+                         void         * ptr,
+                         int            compare(const void*,const void*) )
 {
     const int pos = tr_ptrArrayLowerBound( t, ptr, compare, NULL );
@@ -164 +173 @@
 
 void*
-tr_ptrArrayFindSorted( tr_ptrArray_t  * t,
-                       void           * ptr,
-                       int              compare(const void*,const void*) )
+tr_ptrArrayFindSorted( tr_ptrArray  * t,
+                       const void   * ptr,
+                       int            compare(const void*,const void*) )
 {
     int match;
@@ -174 +183 @@
 
 void*
-tr_ptrArrayRemoveSorted( tr_ptrArray_t  * t,
-                         void           * ptr,
-                         int              compare(const void*,const void*) )
+tr_ptrArrayRemoveSorted( tr_ptrArray  * t,
+                         void         * ptr,
+                         int            compare(const void*,const void*) )
 {
     void * ret = NULL;