in torrent-magnet.c and utils.h, use tr_torrentName() instead of tor->info.name

diff --git a/libtransmission/torrent-magnet.c b/libtransmission/torrent-magnet.c
index 4c81f4c115e21947a8b081fe159a25c4ff8ebf5c..1405c2541d5e4cec2d310daa1bb0db9d8e1c042b 100644 (file)
--- a/libtransmission/torrent-magnet.c
+++ b/libtransmission/torrent-magnet.c
@@ -30,7 +30,7 @@
 #define dbgmsg( tor, ... ) \
     do { \
         if( tr_deepLoggingIsActive( ) ) \
-            tr_deepLog( __FILE__, __LINE__, tor->info.name, __VA_ARGS__ ); \
+            tr_deepLog( __FILE__, __LINE__, tr_torrentName( tor ), __VA_ARGS__ ); \
     } while( 0 )
 
 /***

diff --git a/libtransmission/utils.h b/libtransmission/utils.h
index 826a9b30c01b1d706768fac7c4de5c28b74ec2d9..8d8df7618ca87ec85f168bddf3638dcaf0731b53 100644 (file)
--- a/libtransmission/utils.h
+++ b/libtransmission/utils.h
@@ -141,19 +141,19 @@ void tr_msg( const char * file, int line,
 #define tr_torerr( tor, ... ) \
     do { \
         if( tr_msgLoggingIsActive( TR_MSG_ERR ) ) \
-            tr_msg( __FILE__, __LINE__, TR_MSG_ERR, tor->info.name, __VA_ARGS__ ); \
+            tr_msg( __FILE__, __LINE__, TR_MSG_ERR, tr_torrentName( tor ), __VA_ARGS__ ); \
     } while( 0 )
 
 #define tr_torinf( tor, ... ) \
     do { \
         if( tr_msgLoggingIsActive( TR_MSG_INF ) ) \
-            tr_msg( __FILE__, __LINE__, TR_MSG_INF, tor->info.name, __VA_ARGS__ ); \
+            tr_msg( __FILE__, __LINE__, TR_MSG_INF, tr_torrentName( tor ), __VA_ARGS__ ); \
     } while( 0 )
 
 #define tr_tordbg( tor, ... ) \
     do { \
         if( tr_msgLoggingIsActive( TR_MSG_DBG ) ) \
-            tr_msg( __FILE__, __LINE__, TR_MSG_DBG, tor->info.name, __VA_ARGS__ ); \
+            tr_msg( __FILE__, __LINE__, TR_MSG_DBG, tr_torrentName( tor ), __VA_ARGS__ ); \
     } while( 0 )
 
 #define tr_err( ... ) \