Changeset 7360

Timestamp:

Dec 12, 2008, 2:26:33 AM (12 years ago)

Author:

charles

Message:

(trunk libT) make tr_bencDictMerge() support limited nested merges

File:

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

trunk/libtransmission/bencode.c

@@ -1356 +1356 @@
             int64_t i64;
             const char * str;
+            tr_benc * t;
 
             if( tr_bencGetInt( val, &i64 ) )
@@ -1367 +1368 @@
                 tr_bencDictAddStr( target, key, str );
             }
+            else if( tr_bencIsDict( val ) && tr_bencDictFindDict( target, key, &t ) )
+            {
+                tr_bencMergeDicts( t, val );
+            }
             else
             {
-                tr_err( "tr_bencMergeDicts skipping \"%s\"", key );
+            
+                tr_dbg( "tr_bencMergeDicts skipping \"%s\"", key );
             }
         }