refactor: public tr_session settings API now returns tr_variants (#5983)

This commit is contained in:
Charles Kerr
2023-09-07 19:05:16 -05:00
committed by GitHub
parent 1d1ad6568d
commit ebb1b775af
22 changed files with 377 additions and 427 deletions

View File

@@ -204,8 +204,6 @@ int tr_main(int argc, char* argv[])
tr_locale_set_global("");
tr_variant settings;
tr_formatter_mem_init(MemK, MemKStr, MemMStr, MemGStr, MemTStr);
tr_formatter_size_init(DiskK, DiskKStr, DiskMStr, DiskGStr, DiskTStr);
tr_formatter_speed_init(SpeedK, SpeedKStr, SpeedMStr, SpeedGStr, SpeedTStr);
@@ -220,9 +218,8 @@ int tr_main(int argc, char* argv[])
}
/* load the defaults from config file + libtransmission defaults */
tr_variantInitDict(&settings, 0);
auto const config_dir = getConfigDir(argc, (char const**)argv);
tr_sessionLoadSettings(&settings, config_dir.c_str(), MyConfigName);
auto settings = tr_sessionLoadSettings(config_dir.c_str(), MyConfigName);
/* the command line overrides defaults */
if (parseCommandLine(&settings, argc, (char const**)argv) != 0)