Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-04 15:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: prefer tr_strv*() funcs (#2317)

Browse Source
This commit is contained in:
Charles Kerr
2021-12-15 20:09:46 -06:00
committed by GitHub
parent 42b1362760
commit 2277fde4e0
18 changed files with 101 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtransmission/error.cc
+6 -42
View File
@@ -109,53 +109,17 @@ void tr_error_clear(tr_error** error)
*error = nullptr;
}
static void error_prefix_valist(tr_error** error, char const* prefix_format, va_list args) TR_GNUC_PRINTF(2, 0);
static void error_prefix_valist(tr_error** error, char const* prefix_format, va_list args)
void tr_error_prefix(tr_error** error, char const* prefix)
{
TR_ASSERT(error != nullptr);
TR_ASSERT(*error != nullptr);
TR_ASSERT(prefix_format != nullptr);
char* prefix = tr_strdup_vprintf(prefix_format, args);
char* new_message = tr_strdup_printf("%s%s", prefix, (*error)->message);
tr_free((*error)->message);
(*error)->message = new_message;
tr_free(prefix);
}
void tr_error_prefix(tr_error** error, char const* prefix_format, ...)
{
TR_ASSERT(prefix_format != nullptr);
TR_ASSERT(prefix != nullptr);
if (error == nullptr || *error == nullptr)
{
return;
}
va_list args;
va_start(args, prefix_format);
error_prefix_valist(error, prefix_format, args);
va_end(args);
}
void tr_error_propagate_prefixed(tr_error** new_error, tr_error** old_error, char const* prefix_format, ...)
{
TR_ASSERT(prefix_format != nullptr);
tr_error_propagate(new_error, old_error);
if (new_error == nullptr)
{
return;
}
va_list args;
va_start(args, prefix_format);
error_prefix_valist(new_error, prefix_format, args);
va_end(args);
auto* err = *error;
auto* const new_message = tr_strvDup(tr_strvJoin(prefix, err->message));
tr_free(err->message);
err->message = new_message;
}