Changeset 1612 for trunk/libtransmission/bencode.c

Timestamp:

Mar 31, 2007, 5:40:28 PM (15 years ago)

Author:

joshe

Message:

Remove tr_bencListIter(), it was a stupid idea.

File:

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

trunk/libtransmission/bencode.c

@@ -91 +91 @@
 
         tr_bencInitInt( val, num );
-        val->end = p + 1;
+        *end = p + 1;
     }
     else if( buf[0] == 'l' || buf[0] == 'd' )
@@ -134 +134 @@
         }
 
-        val->end = cur + 1;
+        *end = cur + 1;
     }
     else
@@ -167 +167 @@
         tr_bencInitStr( val, sbuf, slen, 0 );
 
-        val->end = p + 1 + val->val.s.i;
+        *end = p + 1 + val->val.s.i;
     }
 
     val->begin = buf;
-    *end = val->end;
+    val->end   = *end;
 
     return 0;
@@ -244 +244 @@
 benc_val_t * tr_bencDictFind( benc_val_t * val, const char * key )
 {
-    int len, i;
+    int len, ii;
 
     if( val->type != TYPE_DICT )
@@ -253 +253 @@
     len = strlen( key );
     
-    for( i = 0; i < val->val.l.count; i += 2 )
-    {
-        if( TYPE_STR != val->val.l.vals[i].type || 
-            len != val->val.l.vals[i].val.s.i )
+    for( ii = 0; ii + 1 < val->val.l.count; ii += 2 )
+    {
+        if( TYPE_STR  != val->val.l.vals[ii].type ||
+            len       != val->val.l.vals[ii].val.s.i ||
+            0 != memcmp( val->val.l.vals[ii].val.s.s, key, len ) )
         {
             continue;
         }
-        if( 0 == memcmp(val->val.l.vals[i].val.s.s, key, len ) )
-        {
-            return &val->val.l.vals[i+1];
-        }
+        return &val->val.l.vals[ii+1];
     }
 
@@ -287 +285 @@
 
     return ret;
-}
-
-benc_val_t * tr_bencListIter( benc_val_t * list, int * pos )
-{
-    assert( TYPE_LIST == list->type );
-
-    if( NULL == list->val.l.vals )
-    {
-        return NULL;
-    }
-
-    if( 0 > *pos )
-    {
-        *pos = 0;
-    }
-
-    if( list->val.l.count <= *pos )
-    {
-        return NULL;
-    }
-
-    (*pos)++;
-
-    return &list->val.l.vals[ (*pos) - 1 ];
 }