Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow frontend to supply a custom function for displaying libtransmission errors.

Browse Source
This commit is contained in:
Josh Elsasser
2006-07-16 23:40:22 +00:00
parent 9e236c1f87
commit 555f12b64a
5 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libtransmission/inout.c
View File

@@ -265,7 +265,8 @@ static int createFiles( tr_io_t * io )
else if( ( sb.st_mode & S_IFMT ) != S_IFREG )
{
/* Node exists but isn't a file */
printf( "Remove %s, it's in the way.\n", path );
/* XXX this should be reported to the frontend somehow */
tr_err( "Remove %s, it's in the way.", path );
free( path );
return 1;
}

32
libtransmission/metainfo.c
View File

@@ -59,12 +59,12 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
if( stat( path, &sb ) )
{
fprintf( stderr, "Could not stat file (%s)\n", path );
tr_err( "Could not stat file (%s)", path );
return 1;
}
if( ( sb.st_mode & S_IFMT ) != S_IFREG )
{
fprintf( stderr, "Not a regular file (%s)\n", path );
tr_err( "Not a regular file (%s)", path );
return 1;
}
if( sb.st_size > TORRENT_MAX_SIZE )
@@ -77,14 +77,14 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
file = fopen( path, "rb" );
if( !file )
{
fprintf( stderr, "Could not open file (%s)\n", path );
tr_err( "Could not open file (%s)", path );
return 1;
}
buf = malloc( sb.st_size );
fseek( file, 0, SEEK_SET );
if( fread( buf, sb.st_size, 1, file ) != 1 )
{
fprintf( stderr, "Read error (%s)\n", path );
tr_err( "Read error (%s)", path );
free( buf );
fclose( file );
return 1;
@@ -94,7 +94,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
/* Parse bencoded infos */
if( tr_bencLoad( buf, sb.st_size, &meta, NULL ) )
{
fprintf( stderr, "Error while parsing bencoded data\n" );
tr_err( "Error while parsing bencoded data" );
free( buf );
return 1;
}
@@ -102,7 +102,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
/* Get info hash */
if( !( beInfo = tr_bencDictFind( &meta, "info" ) ) )
{
fprintf( stderr, "Could not find \"info\" dictionary\n" );
tr_err( "Could not find \"info\" dictionary" );
tr_bencFree( &meta );
free( buf );
return 1;
@@ -122,7 +122,8 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
file = fopen( inf->torrent, "wb" );
if( !file )
{
fprintf( stderr, "Could not open file (%s) (%s)\n", inf->torrent, strerror(errno) );
tr_err( "Could not open file (%s) (%s)",
inf->torrent, strerror(errno) );
tr_bencFree( &meta );
free( buf );
return 1;
@@ -130,7 +131,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
fseek( file, 0, SEEK_SET );
if( fwrite( buf, sb.st_size, 1, file ) != 1 )
{
fprintf( stderr, "Write error (%s)\n", inf->torrent );
tr_err( "Write error (%s)", inf->torrent );
tr_bencFree( &meta );
free( buf );
fclose( file );
@@ -148,7 +149,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
if( !( val = tr_bencDictFind( &meta, "announce" ) ) )
{
fprintf( stderr, "No \"announce\" entry\n" );
tr_err( "No \"announce\" entry" );
tr_bencFree( &meta );
return 1;
}
@@ -163,8 +164,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
/* Parse announce URL */
if( strncmp( s3, "http://", 7 ) )
{
fprintf( stderr, "Invalid announce URL (%s)\n",
inf->trackerAddress );
tr_err( "Invalid announce URL (%s)", inf->trackerAddress );
tr_bencFree( &meta );
return 1;
}
@@ -184,8 +184,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
}
else
{
fprintf( stderr, "Invalid announce URL (%s)\n",
inf->trackerAddress );
tr_err( "Invalid announce URL (%s)", inf->trackerAddress );
tr_bencFree( &meta );
return 1;
}
@@ -194,7 +193,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
/* Piece length */
if( !( val = tr_bencDictFind( beInfo, "piece length" ) ) )
{
fprintf( stderr, "No \"piece length\" entry\n" );
tr_err( "No \"piece length\" entry" );
tr_bencFree( &meta );
return 1;
}
@@ -204,8 +203,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
val = tr_bencDictFind( beInfo, "pieces" );
if( val->val.s.i % SHA_DIGEST_LENGTH )
{
fprintf( stderr, "Invalid \"piece\" string (size is %d)\n",
val->val.s.i );
tr_err( "Invalid \"piece\" string (size is %d)", val->val.s.i );
tr_bencFree( &meta );
return 1;
}
@@ -263,7 +261,7 @@ int tr_metainfoParse( tr_info_t * inf, const char * path,
if( (uint64_t) inf->pieceCount !=
( inf->totalSize + inf->pieceSize - 1 ) / inf->pieceSize )
{
fprintf( stderr, "Size of hashes and files don't match\n" );
tr_err( "Size of hashes and files don't match" );
free( inf->pieces );
tr_bencFree( &meta );
return 1;

10
libtransmission/tracker.c
View File

@@ -635,7 +635,7 @@ int tr_trackerScrape( tr_torrent_t * tor, int * seeders, int * leechers )
if( ret == TR_RESOLVE_ERROR ||
( ret == TR_RESOLVE_WAIT && tr_date() > date + 10000 ) )
{
fprintf( stderr, "Could not resolve %s\n", inf->trackerAddress );
tr_err( "Could not resolve %s", inf->trackerAddress );
tr_netResolveClose( resolve );
return 1;
}
@@ -660,7 +660,7 @@ int tr_trackerScrape( tr_torrent_t * tor, int * seeders, int * leechers )
ret = tr_netSend( s, buf, len );
if( ret & TR_NET_CLOSE )
{
fprintf( stderr, "Could not connect to tracker\n" );
tr_err( "Could not connect to tracker" );
tr_netClose( s );
return 1;
}
@@ -668,7 +668,7 @@ int tr_trackerScrape( tr_torrent_t * tor, int * seeders, int * leechers )
{
if( tr_date() > date + 10000 )
{
fprintf( stderr, "Could not connect to tracker\n" );
tr_err( "Could not connect to tracker" );
tr_netClose( s );
return 1;
}
@@ -692,7 +692,7 @@ int tr_trackerScrape( tr_torrent_t * tor, int * seeders, int * leechers )
{
if( tr_date() > date + 10000 )
{
fprintf( stderr, "Could not read from tracker\n" );
tr_err( "Could not read from tracker" );
tr_netClose( s );
return 1;
}
@@ -706,7 +706,7 @@ int tr_trackerScrape( tr_torrent_t * tor, int * seeders, int * leechers )
if( pos < 1 )
{
fprintf( stderr, "Could not read from tracker\n" );
tr_err( "Could not read from tracker" );
tr_netClose( s );
return 1;
}

10
libtransmission/transmission.h
View File

@@ -56,6 +56,16 @@ extern "C" {
typedef struct tr_handle_s tr_handle_t;
tr_handle_t * tr_init();
/***********************************************************************
* tr_setErrorFunction
***********************************************************************
* Sets the function used to display libtransmission errors. A NULL
* function means to use the default, which simple prints the message
* to stderr. The function's prototype should look like this:
* void myErrFunc( const char * errstr );
**********************************************************************/
void tr_setErrorFunction( void (*func)( const char * ) );
/***********************************************************************
* tr_getPrefsDirectory
***********************************************************************

17
libtransmission/utils.c
View File

@@ -24,6 +24,13 @@
#include "transmission.h"
static void (*errorFunc)( const char * );
void tr_setErrorFunction( void (*func)( const char * ) )
{
errorFunc = func;
}
void tr_msg( int level, char * msg, ... )
{
char string[256];
@@ -50,7 +57,15 @@ void tr_msg( int level, char * msg, ... )
va_start( args, msg );
vsnprintf( string, sizeof( string ), msg, args );
va_end( args );
fprintf( stderr, "%s\n", string );
if( NULL == errorFunc )
{
fprintf( stderr, "%s\n", string );
}
else
{
errorFunc( string );
}
}
int tr_rand( int sup )