Changeset 2162 for trunk/libtransmission/bencode.c

Timestamp:

Jun 19, 2007, 1:49:56 AM (15 years ago)

Author:

charles

Message:

• makemeta: don't add dotfiles to the torrents
• bencode: trying to chase down a memory leak

File:

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

trunk/libtransmission/bencode.c

@@ -30 +30 @@
 static int makeroom( benc_val_t * val, int count )
 {
-    int    len;
-    void * new;
-
     assert( TYPE_LIST == val->type || TYPE_DICT == val->type );
 
-    if( val->val.l.count + count <= val->val.l.alloc )
-    {
-        return 0;
-    }
-
-    /* We need a bigger boat */
-    len = val->val.l.alloc + count +
-        ( count % LIST_SIZE ? LIST_SIZE - ( count % LIST_SIZE ) : 0 );
-    new = realloc( val->val.l.vals, len * sizeof( benc_val_t ) );
-    if( NULL == new )
-    {
-        return 1;
-    }
-
-    val->val.l.alloc = len;
-    val->val.l.vals  = new;
+    if( val->val.l.count + count > val->val.l.alloc )
+    {
+        /* We need a bigger boat */
+        const int len = val->val.l.alloc + count +
+            ( count % LIST_SIZE ? LIST_SIZE - ( count % LIST_SIZE ) : 0 );
+        void * new = realloc( val->val.l.vals, len * sizeof( benc_val_t ) );
+        if( NULL == new )
+            return 1;
+
+        val->val.l.alloc = len;
+        val->val.l.vals  = new;
+    }
 
     return 0;
@@ -328 +321 @@
 int tr_bencInitStrDup( benc_val_t * val, const char * str )
 {
-    char * new = NULL;
-
-    if( NULL != str )
-    {
-        new = strdup( str );
-        if( NULL == new )
-        {
-            return 1;
-        }
-    }
-
-    _tr_bencInitStr( val, new, 0, 0 );
-
+    char * newStr = tr_strdup( str );
+    if( newStr == NULL )
+        return 1;
+
+    _tr_bencInitStr( val, newStr, 0, 0 );
     return 0;
 }
@@ -354 +339 @@
     assert( TYPE_LIST == val->type );
 
-    if( makeroom( val, count ) )
-    {
-        return 1;
-    }
-
-    return 0;
+    return makeroom( val, count );
 }
 
@@ -366 +346 @@
     assert( TYPE_DICT == val->type );
 
-    if( makeroom( val, count * 2 ) )
-    {
-        return 1;
-    }
-
-    return 0;
+    return makeroom( val, count * 2 );
 }