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

refactor: tr_env_get_string() now returns a std::string (#3527)

Browse Source
This commit is contained in:
Charles Kerr
2022-07-26 23:26:37 -05:00
committed by GitHub
parent 01df5e9f92
commit 0e7ef51d5c
7 changed files with 45 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtransmission/utils.cc
+16 -27
View File
@@ -1269,53 +1269,42 @@ int tr_env_get_int(char const* key, int default_value)
return default_value;
}
char* tr_env_get_string(char const* key, char const* default_value)
std::string tr_env_get_string(std::string_view key, std::string_view default_value)
{
TR_ASSERT(key != nullptr);
#ifdef _WIN32
wchar_t* wide_key = tr_win32_utf8_to_native(key, -1);
char* value = nullptr;
if (wide_key != nullptr)
if (auto* const wide_key = tr_win32_utf8_to_native(std::data(key), std::size(key)); wide_key != nullptr)
{
DWORD const size = GetEnvironmentVariableW(wide_key, nullptr, 0);
if (size != 0)
if (auto const size = GetEnvironmentVariableW(wide_key, nullptr, 0); size != 0)
{
wchar_t* const wide_value = tr_new(wchar_t, size);
auto wide_val = std::vector<wchar_t>{};
wide_val.resize(size);
if (GetEnvironmentVariableW(wide_key, wide_value, size) == size - 1)
if (GetEnvironmentVariableW(wide_key, std::data(wide_val), std::size(wide_val)) == std::size(wide_val) - 1)
{
value = tr_win32_native_to_utf8(wide_value, size);
char* const val = tr_win32_native_to_utf8(std::data(wide_val), std::size(wide_val));
auto ret = std::string{ val };
tr_free(val);
tr_free(wide_key);
return ret;
}
tr_free(wide_value);
}
tr_free(wide_key);
}
if (value == nullptr && default_value != nullptr)
{
value = tr_strdup(default_value);
}
return value;
#else
char const* value = getenv(key);
auto const szkey = tr_strbuf<char, 256>{ key };
if (value == nullptr)
if (auto const* const value = getenv(szkey); value != nullptr)
{
value = default_value;
return value;
}
return value != nullptr ? tr_strvDup(value) : nullptr;
#endif
return std::string{ default_value };
}
/***