Changeset 12012 for trunk/libtransmission/bencode.c

Timestamp:

Feb 23, 2011, 3:54:04 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) #4048 "use bitsets instead of bitfield in tr_completion" -- done.

Excuse the sprawl. Much of this didn't fit into self-contained commits.

File:

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

trunk/libtransmission/bencode.c

@@ -477 +477 @@
 
 tr_bool
+tr_bencGetRaw( const tr_benc * val, const uint8_t ** setme_raw, size_t * setme_len )
+{
+    const tr_bool success = tr_bencIsString( val );
+
+    if( success ) {
+        *setme_raw = (uint8_t*) getStr(val);
+        *setme_len = val->val.s.len;
+    }
+
+    return success;
+}
+
+tr_bool
 tr_bencGetBool( const tr_benc * val, tr_bool * setme )
 {
@@ -564 +577 @@
 
 tr_bool
-tr_bencDictFindRaw( tr_benc         * dict,
-                    const char      * key,
-                    const uint8_t  ** setme_raw,
-                    size_t          * setme_len )
-{
-    tr_benc * child;
-    const tr_bool found = tr_bencDictFindType( dict, key, TR_TYPE_STR, &child );
-
-    if( found ) {
-        *setme_raw = (uint8_t*) getStr(child);
-        *setme_len = child->val.s.len;
-    }
-
-    return found;
+tr_bencDictFindRaw( tr_benc * dict, const char * key, const uint8_t  ** setme_raw, size_t * setme_len )
+{
+    return tr_bencGetRaw( tr_bencDictFind( dict, key ), setme_raw, setme_len );
 }
 
@@ -1705 +1707 @@
         else
         {
-            tr_fsync( fd );
+            //tr_fsync( fd );
             tr_close_file( fd );