Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-02-14 23:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add tr_strvToBuf() (#3657)

Browse Source 
* feat: add tr_getDefaultConfigDirToBuf()

* feat: add tr_getDefaultDownloadDirToBuf()

* feat: add tr_strvToBuf()

* feat: add tr_torrentFindFileToBuf()

* feat: add tr_torrentGetMagnetLinkToBuf()

* refactor: remove unused makeString() from tests

* feat: add tr_torrentFilenameToBuf()

* feat: add tr_torrentGetTrackerListToBuf()

* chore: remove obsolete comment references to tr_free

* chore: remove unused tr_strdup()

* chore: remove unused forward declarations
This commit is contained in:
Charles Kerr
2022-08-16 19:28:57 -05:00
committed by GitHub
parent 988d8ff9ac
commit e49747ab51
24 changed files with 193 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cli/cli.cc
View File

@@ -173,10 +173,9 @@ static std::string getStatusStr(tr_stat const* st)
return "";
}
static char const* getConfigDir(int argc, char const** argv)
static std::string getConfigDir(int argc, char const** argv)
{
int c;
char const* configDir = nullptr;
char const* my_optarg;
int const ind = tr_optind;
@@ -184,19 +183,14 @@ static char const* getConfigDir(int argc, char const** argv)
{
if (c == 'g')
{
configDir = my_optarg;
return my_optarg;
break;
}
}
tr_optind = ind;
if (configDir == nullptr)
{
configDir = tr_getDefaultConfigDir(MyConfigName);
}
return configDir;
return tr_getDefaultConfigDir(MyConfigName);
}
int tr_main(int argc, char* argv[])
@@ -218,8 +212,8 @@ int tr_main(int argc, char* argv[])
/* load the defaults from config file + libtransmission defaults */
tr_variantInitDict(&settings, 0);
char const* const configDir = getConfigDir(argc, (char const**)argv);
tr_sessionLoadSettings(&settings, configDir, MyConfigName);
auto const config_dir = getConfigDir(argc, (char const**)argv);
tr_sessionLoadSettings(&settings, config_dir.c_str(), MyConfigName);
/* the command line overrides defaults */
if (parseCommandLine(&settings, argc, (char const**)argv) != 0)
@@ -256,7 +250,7 @@ int tr_main(int argc, char* argv[])
}
}
auto* const h = tr_sessionInit(configDir, false, &settings);
auto* const h = tr_sessionInit(config_dir.c_str(), false, &settings);
auto* const ctor = tr_ctorNew(h);
tr_ctorSetPaused(ctor, TR_FORCE, false);
@@ -353,7 +347,7 @@ int tr_main(int argc, char* argv[])
}
}
tr_sessionSaveSettings(h, configDir, &settings);
tr_sessionSaveSettings(h, config_dir.c_str(), &settings);
printf("\n");
tr_variantFree(&settings);