From 8983af7e46db98dfd3333252be0f1d72fcffef0a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 5 Oct 2021 13:54:02 -0500 Subject: [PATCH] refactor: make some tr_session methods private (#1879) These public methods weren't used anywhere except in tr_session, so make them private. tr_sessionGetAltSpeed_Bps() tr_sessionGetPieceSpeed_Bps() tr_sessionGetRawSpeed_Bps() tr_sessionSetAltSpeed_Bps() tr_sessionSetSpeedLimit_Bps() --- libtransmission/session.cc | 10 ++++++---- libtransmission/session.h | 5 ----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libtransmission/session.cc b/libtransmission/session.cc index 90a64469b..42465a71d 100644 --- a/libtransmission/session.cc +++ b/libtransmission/session.cc @@ -1453,6 +1453,8 @@ uint16_t tr_sessionGetIdleLimit(tr_session const* session) **** ***/ +static unsigned int tr_sessionGetAltSpeed_Bps(tr_session const* s, tr_direction d); + bool tr_sessionGetActiveSpeedLimit_Bps(tr_session const* session, tr_direction dir, unsigned int* setme_Bps) { bool isLimited = true; @@ -1627,7 +1629,7 @@ static void turtleBootstrap(tr_session* session, struct tr_turtle_info* turtle) **** Primary session speed limits ***/ -void tr_sessionSetSpeedLimit_Bps(tr_session* s, tr_direction d, unsigned int Bps) +static void tr_sessionSetSpeedLimit_Bps(tr_session* s, tr_direction d, unsigned int Bps) { TR_ASSERT(tr_isSession(s)); TR_ASSERT(tr_isDirection(d)); @@ -1677,7 +1679,7 @@ bool tr_sessionIsSpeedLimited(tr_session const* s, tr_direction d) **** Alternative speed limits that are used during scheduled times ***/ -void tr_sessionSetAltSpeed_Bps(tr_session* s, tr_direction d, unsigned int Bps) +static void tr_sessionSetAltSpeed_Bps(tr_session* s, tr_direction d, unsigned int Bps) { TR_ASSERT(tr_isSession(s)); TR_ASSERT(tr_isDirection(d)); @@ -1692,7 +1694,7 @@ void tr_sessionSetAltSpeed_KBps(tr_session* s, tr_direction d, unsigned int KBps tr_sessionSetAltSpeed_Bps(s, d, toSpeedBytes(KBps)); } -unsigned int tr_sessionGetAltSpeed_Bps(tr_session const* s, tr_direction d) +static unsigned int tr_sessionGetAltSpeed_Bps(tr_session const* s, tr_direction d) { TR_ASSERT(tr_isSession(s)); TR_ASSERT(tr_isDirection(d)); @@ -1892,7 +1894,7 @@ unsigned int tr_sessionGetPieceSpeed_Bps(tr_session const* session, tr_direction return tr_isSession(session) ? tr_bandwidthGetPieceSpeed_Bps(&session->bandwidth, 0, dir) : 0; } -unsigned int tr_sessionGetRawSpeed_Bps(tr_session const* session, tr_direction dir) +static unsigned int tr_sessionGetRawSpeed_Bps(tr_session const* session, tr_direction dir) { return tr_isSession(session) ? tr_bandwidthGetRawSpeed_Bps(&session->bandwidth, 0, dir) : 0; } diff --git a/libtransmission/session.h b/libtransmission/session.h index 2dd42ed8c..39b7af3dd 100644 --- a/libtransmission/session.h +++ b/libtransmission/session.h @@ -334,13 +334,8 @@ static inline int toMemMB(uint64_t B) **/ unsigned int tr_sessionGetSpeedLimit_Bps(tr_session const*, tr_direction); -unsigned int tr_sessionGetAltSpeed_Bps(tr_session const*, tr_direction); -unsigned int tr_sessionGetRawSpeed_Bps(tr_session const*, tr_direction); unsigned int tr_sessionGetPieceSpeed_Bps(tr_session const*, tr_direction); -void tr_sessionSetSpeedLimit_Bps(tr_session*, tr_direction, unsigned int Bps); -void tr_sessionSetAltSpeed_Bps(tr_session*, tr_direction, unsigned int Bps); - bool tr_sessionGetActiveSpeedLimit_Bps(tr_session const* session, tr_direction dir, unsigned int* setme); std::vector tr_sessionGetNextQueuedTorrents(tr_session* session, tr_direction dir, size_t numwanted);