(trunk libT) minor cleanup: improve the function names torrentConstructor() and torrentDestructor().
These functions actually allocate/free the memory where these objects reside, so it's clearer to name them torrentNew() and torrentDelete().
This commit is contained in:
parent
bf8e4594e0
commit
0c6c569b69
|
@ -483,7 +483,7 @@ replicationNew( Torrent * t )
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
torrentDestructor( void * vt )
|
torrentFree( void * vt )
|
||||||
{
|
{
|
||||||
Torrent * t = vt;
|
Torrent * t = vt;
|
||||||
|
|
||||||
|
@ -508,8 +508,7 @@ torrentDestructor( void * vt )
|
||||||
static void peerCallbackFunc( tr_peer *, const tr_peer_event *, void * );
|
static void peerCallbackFunc( tr_peer *, const tr_peer_event *, void * );
|
||||||
|
|
||||||
static Torrent*
|
static Torrent*
|
||||||
torrentConstructor( tr_peerMgr * manager,
|
torrentNew( tr_peerMgr * manager, tr_torrent * tor )
|
||||||
tr_torrent * tor )
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
Torrent * t;
|
Torrent * t;
|
||||||
|
@ -2430,7 +2429,7 @@ tr_peerMgrAddTorrent( tr_peerMgr * manager, tr_torrent * tor )
|
||||||
assert( tr_torrentIsLocked( tor ) );
|
assert( tr_torrentIsLocked( tor ) );
|
||||||
assert( tor->torrentPeers == NULL );
|
assert( tor->torrentPeers == NULL );
|
||||||
|
|
||||||
tor->torrentPeers = torrentConstructor( manager, tor );
|
tor->torrentPeers = torrentNew( manager, tor );
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -2440,7 +2439,7 @@ tr_peerMgrRemoveTorrent( tr_torrent * tor )
|
||||||
assert( tr_torrentIsLocked( tor ) );
|
assert( tr_torrentIsLocked( tor ) );
|
||||||
|
|
||||||
stopTorrent( tor->torrentPeers );
|
stopTorrent( tor->torrentPeers );
|
||||||
torrentDestructor( tor->torrentPeers );
|
torrentFree( tor->torrentPeers );
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue