Changeset 8247 for trunk/libtransmission/utils.c

Timestamp:

Apr 16, 2009, 9:00:48 PM (13 years ago)

Author:

charles

Message:

(trunk libT) avoid unnecessary malloc()s & free()s in tr_utf8clean()

File:

• trunk/libtransmission/utils.c (modified) (1 diff)

trunk/libtransmission/utils.c

@@ -1353 +1353 @@
 tr_utf8clean( const char * str, int max_len, tr_bool * err )
 {
-    const char zero = '\0';
     char * ret;
-    struct evbuffer * buf = evbuffer_new( );
     const char * end;
+
+    if( max_len < 0 )
+        max_len = (int) strlen( str );
 
     if( err != NULL )
         *err = FALSE;
 
-    if( max_len < 0 )
-        max_len = (int) strlen( str );
-
-    while( !tr_utf8_validate ( str, max_len, &end ) )
-    {
-        const int good_len = end - str;
-
-        evbuffer_add( buf, str, good_len );
-        max_len -= ( good_len + 1 );
-        str += ( good_len + 1 );
-        evbuffer_add( buf, "?", 1 );
-
-        if( err != NULL )
-            *err = TRUE;
-    }
-
-    evbuffer_add( buf, str, max_len );
-    evbuffer_add( buf, &zero, 1 );
-    ret = tr_memdup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+    if( tr_utf8_validate( str, max_len, &end  ) )
+    {
+        ret = tr_strndup( str, max_len );
+    }
+    else
+    {
+        const char zero = '\0';
+        struct evbuffer * buf = evbuffer_new( );
+
+        while( !tr_utf8_validate ( str, max_len, &end ) )
+        {
+            const int good_len = end - str;
+
+            evbuffer_add( buf, str, good_len );
+            max_len -= ( good_len + 1 );
+            str += ( good_len + 1 );
+            evbuffer_add( buf, "?", 1 );
+
+            if( err != NULL )
+                *err = TRUE;
+        }
+
+        evbuffer_add( buf, str, max_len );
+        evbuffer_add( buf, &zero, 1 );
+        ret = tr_memdup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+        evbuffer_free( buf );
+    }
+
     assert( tr_utf8_validate( ret, -1, NULL ) );
-    evbuffer_free( buf );
     return ret;
 }