Changeset 6069

Timestamp:

Jun 6, 2008, 11:53:30 PM (14 years ago)

Author:

charles

Message:

(libT) 1. tweak tr_bitfieldTestFast(). 2. add tr_memdup()

Location:

trunk/libtransmission

Files:

• utils.c (modified) (2 diffs)
• utils.h (modified) (2 diffs)

trunk/libtransmission/utils.c

@@ -589 +589 @@
 ****/
 
+void*
+tr_memdup( const void * in, int byteCount )
+{
+    void * out = tr_new( uint8_t, byteCount );
+    memcpy( out, in, byteCount );
+    return out;
+}
+    
 char*
 tr_strdup( const char * in )
@@ -693 +701 @@
     tr_bitfield * ret = calloc( 1, sizeof(tr_bitfield) );
     ret->len = in->len;
-    ret->bits = malloc( ret->len );
-    memcpy( ret->bits, in->bits, ret->len );
+    ret->bits = tr_memdup( in->bits, in->len );
     return ret;
 }

trunk/libtransmission/utils.h

@@ -191 +191 @@
 char* tr_strdup( const char * str ) TR_GNUC_MALLOC;
 char* tr_strndup( const char * str, int len ) TR_GNUC_MALLOC;
+void* tr_memdup( const void * src, int byteCount ) TR_GNUC_MALLOC;
 char* tr_strdup_printf( const char * fmt, ... )  TR_GNUC_PRINTF( 1, 2 ) TR_GNUC_MALLOC;
 char* tr_base64_encode( const void * input, int inlen, int *outlen ) TR_GNUC_MALLOC;
@@ -272 +273 @@
 /** @param high the highest nth bit you're going to access */
 #define tr_bitfieldTestFast(bitfield,high) \
-    ((bitfield) && ( (bitfield)->bits ) && ( ((high)>>3u) < (bitfield)->len ))
+    ((bitfield) && ( (bitfield)->bits ) && ( (high) <= (bitfield)->len*8 ))
 
 double tr_getRatio( double numerator, double denominator );