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

refactor: use maybe unused attribute (#1918)

Browse Source 
* refactor: replace TR_UNUSED with [[maybe_unused]]
This commit is contained in:
Charles Kerr
2021-10-10 11:52:26 -05:00
committed by GitHub
parent a4d7e11a14
commit 1fb5a79813
47 changed files with 255 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
libtransmission/rpcimpl.cc
View File

@@ -210,12 +210,9 @@ static void notifyBatchQueueChange(tr_session* session, tr_torrent** torrents, i
static char const* queueMoveTop(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
int n;
tr_torrent** torrents = getTorrents(session, args_in, &n);
tr_torrentsQueueMoveTop(torrents, n);
@@ -227,12 +224,9 @@ static char const* queueMoveTop(
static char const* queueMoveUp(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
int n;
tr_torrent** torrents = getTorrents(session, args_in, &n);
tr_torrentsQueueMoveUp(torrents, n);
@@ -244,12 +238,9 @@ static char const* queueMoveUp(
static char const* queueMoveDown(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
int n;
tr_torrent** torrents = getTorrents(session, args_in, &n);
tr_torrentsQueueMoveDown(torrents, n);
@@ -261,12 +252,9 @@ static char const* queueMoveDown(
static char const* queueMoveBottom(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
int n;
tr_torrent** torrents = getTorrents(session, args_in, &n);
tr_torrentsQueueMoveBottom(torrents, n);
@@ -286,14 +274,9 @@ static int compareTorrentByQueuePosition(void const* va, void const* vb)
static char const* torrentStart(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
@@ -317,14 +300,9 @@ static char const* torrentStart(
static char const* torrentStartNow(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
@@ -348,14 +326,9 @@ static char const* torrentStartNow(
static char const* torrentStop(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
@@ -377,14 +350,9 @@ static char const* torrentStop(
static char const* torrentRemove(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
bool deleteFlag;
if (!tr_variantDictFindBool(args_in, TR_KEY_delete_local_data, &deleteFlag))
@@ -415,14 +383,9 @@ static char const* torrentRemove(
static char const* torrentReannounce(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
@@ -444,14 +407,9 @@ static char const* torrentReannounce(
static char const* torrentVerify(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
@@ -982,12 +940,8 @@ static char const* torrentGet(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
tr_variant* list = tr_variantDictAddList(args_out, TR_KEY_torrents, torrentCount + 1);
@@ -1402,14 +1356,9 @@ static char const* removeTrackers(tr_torrent* tor, tr_variant* ids)
static char const* torrentSet(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
int torrentCount;
tr_torrent** torrents = getTorrents(session, args_in, &torrentCount);
@@ -1545,14 +1494,9 @@ static char const* torrentSet(
static char const* torrentSetLocation(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
char const* location = nullptr;
if (!tr_variantDictFindStr(args_in, TR_KEY_location, &location, nullptr))
@@ -1614,11 +1558,9 @@ static void torrentRenamePathDone(tr_torrent* tor, char const* oldpath, char con
static char const* torrentRenamePath(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
[[maybe_unused]] tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
char const* errmsg = nullptr;
char const* oldpath = nullptr;
@@ -1647,18 +1589,14 @@ static char const* torrentRenamePath(
***/
static void portTested(
tr_session* session,
bool did_connect,
bool did_timeout,
[[maybe_unused]] tr_session* session,
[[maybe_unused]] bool did_connect,
[[maybe_unused]] bool did_timeout,
long response_code,
void const* response,
size_t response_byte_count,
void* user_data)
{
TR_UNUSED(session);
TR_UNUSED(did_connect);
TR_UNUSED(did_timeout);
char result[1024];
auto* data = static_cast<struct tr_rpc_idle_data*>(user_data);
@@ -1681,11 +1619,12 @@ static void portTested(
tr_idle_function_done(data, result);
}
static char const* portTest(tr_session* session, tr_variant* args_in, tr_variant* args_out, struct tr_rpc_idle_data* idle_data)
static char const* portTest(
tr_session* session,
[[maybe_unused]] tr_variant* args_in,
[[maybe_unused]] tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_in);
TR_UNUSED(args_out);
int const port = tr_sessionGetPeerPort(session);
char* url = tr_strdup_printf("https://portcheck.transmissionbt.com/%d", port);
tr_webRun(session, url, portTested, idle_data);
@@ -1699,16 +1638,13 @@ static char const* portTest(tr_session* session, tr_variant* args_in, tr_variant
static void gotNewBlocklist(
tr_session* session,
bool did_connect,
bool did_timeout,
[[maybe_unused]] bool did_connect,
[[maybe_unused]] bool did_timeout,
long response_code,
void const* response,
size_t response_byte_count,
void* user_data)
{
TR_UNUSED(did_connect);
TR_UNUSED(did_timeout);
char result[1024];
auto* data = static_cast<struct tr_rpc_idle_data*>(user_data);
@@ -1809,13 +1745,10 @@ static void gotNewBlocklist(
static char const* blocklistUpdate(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
[[maybe_unused]] tr_variant* args_in,
[[maybe_unused]] tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_in);
TR_UNUSED(args_out);
tr_webRun(session, session->blocklist_url, gotNewBlocklist, idle_data);
return nullptr;
}
@@ -1882,18 +1815,14 @@ struct add_torrent_idle_data
};
static void gotMetadataFromURL(
tr_session* session,
bool did_connect,
bool did_timeout,
[[maybe_unused]] tr_session* session,
[[maybe_unused]] bool did_connect,
[[maybe_unused]] bool did_timeout,
long response_code,
void const* response,
size_t response_byte_count,
void* user_data)
{
TR_UNUSED(session);
TR_UNUSED(did_connect);
TR_UNUSED(did_timeout);
auto* data = static_cast<struct add_torrent_idle_data*>(user_data);
dbgmsg(
@@ -1955,11 +1884,9 @@ static tr_file_index_t* fileListFromList(tr_variant* list, tr_file_index_t* setm
static char const* torrentAdd(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
[[maybe_unused]] tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_ASSERT(idle_data != nullptr);
char const* filename = nullptr;
@@ -2094,14 +2021,9 @@ static char const* torrentAdd(
static char const* sessionSet(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
char const* download_dir = nullptr;
char const* incomplete_dir = nullptr;
@@ -2359,15 +2281,10 @@ static char const* sessionSet(
static char const* sessionStats(
tr_session* session,
tr_variant* args_in,
[[maybe_unused]] tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_in);
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
auto currentStats = tr_session_stats{};
auto cumulativeStats = tr_session_stats{};
@@ -2636,12 +2553,12 @@ static void addSessionField(tr_session* s, tr_variant* d, tr_quark key)
}
}
static char const* sessionGet(tr_session* s, tr_variant* args_in, tr_variant* args_out, struct tr_rpc_idle_data* idle_data)
static char const* sessionGet(
tr_session* s,
tr_variant* args_in,
tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(idle_data);
TR_ASSERT(idle_data == nullptr);
tr_variant* fields;
if (tr_variantDictFindList(args_in, TR_KEY_fields, &fields))
@@ -2678,10 +2595,12 @@ static char const* sessionGet(tr_session* s, tr_variant* args_in, tr_variant* ar
return nullptr;
}
static char const* freeSpace(tr_session* session, tr_variant* args_in, tr_variant* args_out, struct tr_rpc_idle_data* idle_data)
static char const* freeSpace(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(idle_data);
int tmperr;
char const* path = nullptr;
char const* err = nullptr;
@@ -2725,14 +2644,10 @@ static char const* freeSpace(tr_session* session, tr_variant* args_in, tr_varian
static char const* sessionClose(
tr_session* session,
tr_variant* args_in,
tr_variant* args_out,
struct tr_rpc_idle_data* idle_data)
[[maybe_unused]] tr_variant* args_in,
[[maybe_unused]] tr_variant* args_out,
[[maybe_unused]] struct tr_rpc_idle_data* idle_data)
{
TR_UNUSED(args_in);
TR_UNUSED(args_out);
TR_UNUSED(idle_data);
notify(session, TR_RPC_SESSION_CLOSE, nullptr);
return nullptr;
}
@@ -2773,11 +2688,11 @@ static struct method
{ "queue-move-bottom", true, queueMoveBottom },
};
static void noop_response_callback(tr_session* session, tr_variant* response, void* user_data)
static void noop_response_callback(
[[maybe_unused]] tr_session* session,
[[maybe_unused]] tr_variant* response,
[[maybe_unused]] void* user_data)
{
TR_UNUSED(session);
TR_UNUSED(response);
TR_UNUSED(user_data);
}
void tr_rpc_request_exec_json(