mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-31 11:23:40 +00:00
Code Issues Releases Wiki Activity

(libT) one more low-hanging fruit from softwareelves' Shark reports: simplify tr_buildPath() to shave off another few %

Browse source
This commit is contained in:
Charles Kerr 2008-10-29 11:56:55 +00:00
parent 819c1af60e
commit 29f93e3147
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
libtransmission/utils.c
View file

@ -602,26 +602,39 @@ tr_mkdirp( const char * path_in,
char*
tr_buildPath( const char *first_element, ... )
{
char * ret;
struct evbuffer * evbuf;
const char * element = first_element;
va_list vl;
size_t bufLen = 0;
const char * element;
char * buf;
char * pch;
va_list vl;
evbuf = evbuffer_new( );
/* pass 1: allocate enough space for the string */
va_start( vl, first_element );
while( element )
{
if( EVBUFFER_LENGTH( evbuf ) )
evbuffer_add_printf( evbuf, "%c", TR_PATH_DELIMITER );
evbuffer_add_printf( evbuf, "%s", element );
element = first_element;
while( element ) {
bufLen += strlen( element ) + 1;
element = (const char*) va_arg( vl, const char* );
}
pch = buf = tr_new0( char, bufLen );
va_end( vl );
ret = tr_strndup( EVBUFFER_DATA( evbuf ), EVBUFFER_LENGTH( evbuf ) );
evbuffer_free( evbuf );
return ret;
/* pass 2: build the string piece by piece */
va_start( vl, first_element );
element = first_element;
while( element ) {
const size_t elementLen = strlen( element );
if( pch != buf )
*pch++ = TR_PATH_DELIMITER;
memcpy( pch, element, elementLen );
pch += elementLen;
element = (const char*) va_arg( vl, const char* );
}
va_end( vl );
/* sanity checks & return */
*pch++ = '\0';
assert( pch - buf == bufLen );
return buf;
}
/****