Remove unused session tag

This commit is contained in:
Mike Gelfand
2015-10-18 18:39:14 +00:00
parent 3b8829d3fb
commit f89fab72f9
9 changed files with 11 additions and 17 deletions

View File

@@ -280,7 +280,7 @@ tr_main (int argc,
} }
} }
h = tr_sessionInit ("cli", configDir, false, &settings); h = tr_sessionInit (configDir, false, &settings);
ctor = tr_ctorNew (h); ctor = tr_ctorNew (h);

View File

@@ -511,7 +511,7 @@ daemon_start (void * raw_arg,
tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR); tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR);
tr_formatter_size_init (DISK_K, DISK_K_STR, DISK_M_STR, DISK_G_STR, DISK_T_STR); tr_formatter_size_init (DISK_K, DISK_K_STR, DISK_M_STR, DISK_G_STR, DISK_T_STR);
tr_formatter_speed_init (SPEED_K, SPEED_K_STR, SPEED_M_STR, SPEED_G_STR, SPEED_T_STR); tr_formatter_speed_init (SPEED_K, SPEED_K_STR, SPEED_M_STR, SPEED_G_STR, SPEED_T_STR);
session = tr_sessionInit ("daemon", configDir, true, settings); session = tr_sessionInit (configDir, true, settings);
tr_sessionSetRPCCallback (session, on_rpc_callback, NULL); tr_sessionSetRPCCallback (session, on_rpc_callback, NULL);
tr_logAddNamedInfo (NULL, "Using settings from \"%s\"", configDir); tr_logAddNamedInfo (NULL, "Using settings from \"%s\"", configDir);
tr_sessionSaveSettings (session, configDir, settings); tr_sessionSaveSettings (session, configDir, settings);

View File

@@ -523,7 +523,7 @@ on_startup (GApplication * application, gpointer user_data)
g_mkdir_with_parents (str, 0777); g_mkdir_with_parents (str, 0777);
/* initialize the libtransmission session */ /* initialize the libtransmission session */
session = tr_sessionInit ("gtk", cbdata->config_dir, TRUE, gtr_pref_get_all ()); session = tr_sessionInit (cbdata->config_dir, TRUE, gtr_pref_get_all ());
gtr_pref_flag_set (TR_KEY_alt_speed_enabled, tr_sessionUsesAltSpeed (session)); gtr_pref_flag_set (TR_KEY_alt_speed_enabled, tr_sessionUsesAltSpeed (session));
gtr_pref_int_set (TR_KEY_peer_port, tr_sessionGetPeerPort (session)); gtr_pref_int_set (TR_KEY_peer_port, tr_sessionGetPeerPort (session));

View File

@@ -276,7 +276,7 @@ libttest_session_init (tr_variant * settings)
if (!tr_variantDictFind (settings, q)) if (!tr_variantDictFind (settings, q))
tr_variantDictAddInt (settings, q, verbose ? TR_LOG_DEBUG : TR_LOG_ERROR); tr_variantDictAddInt (settings, q, verbose ? TR_LOG_DEBUG : TR_LOG_ERROR);
session = tr_sessionInit ("libtransmission-test", sandbox, !verbose, settings); session = tr_sessionInit (sandbox, !verbose, settings);
tr_free (sandbox); tr_free (sandbox);
tr_variantFree (&local_settings); tr_variantFree (&local_settings);

View File

@@ -581,8 +581,7 @@ struct init_data
}; };
tr_session * tr_session *
tr_sessionInit (const char * tag, tr_sessionInit (const char * configDir,
const char * configDir,
bool messageQueuingEnabled, bool messageQueuingEnabled,
tr_variant * clientSettings) tr_variant * clientSettings)
{ {
@@ -600,7 +599,6 @@ tr_sessionInit (const char * tag,
session->udp6_socket = TR_BAD_SOCKET; session->udp6_socket = TR_BAD_SOCKET;
session->lock = tr_lockNew (); session->lock = tr_lockNew ();
session->cache = tr_cacheNew (1024*1024*2); session->cache = tr_cacheNew (1024*1024*2);
session->tag = tr_strdup (tag);
session->magicNumber = SESSION_MAGIC_NUMBER; session->magicNumber = SESSION_MAGIC_NUMBER;
tr_bandwidthConstruct (&session->bandwidth, session, NULL); tr_bandwidthConstruct (&session->bandwidth, session, NULL);
tr_variantInitList (&session->removedTorrents, 0); tr_variantInitList (&session->removedTorrents, 0);
@@ -1929,7 +1927,6 @@ tr_sessionClose (tr_session * session)
} }
tr_device_info_free (session->downloadDir); tr_device_info_free (session->downloadDir);
tr_free (session->torrentDoneScript); tr_free (session->torrentDoneScript);
tr_free (session->tag);
tr_free (session->configDir); tr_free (session->configDir);
tr_free (session->resumeDir); tr_free (session->resumeDir);
tr_free (session->torrentDir); tr_free (session->torrentDir);

View File

@@ -179,7 +179,6 @@ struct tr_session
char * torrentDoneScript; char * torrentDoneScript;
char * tag;
char * configDir; char * configDir;
char * resumeDir; char * resumeDir;
char * torrentDir; char * torrentDir;

View File

@@ -252,12 +252,11 @@ void tr_sessionSaveSettings (tr_session * session,
* tr_variantInitDict (&settings, 0); * tr_variantInitDict (&settings, 0);
* tr_sessionGetDefaultSettings (&settings); * tr_sessionGetDefaultSettings (&settings);
* configDir = tr_getDefaultConfigDir ("Transmission"); * configDir = tr_getDefaultConfigDir ("Transmission");
* session = tr_sessionInit ("mac", configDir, true, &settings); * session = tr_sessionInit (configDir, true, &settings);
* *
* tr_variantFree (&settings); * tr_variantFree (&settings);
* @endcode * @endcode
* *
* @param tag "gtk", "macosx", "daemon", etc... this is only for pre-1.30 resume files
* @param configDir where Transmission will look for resume files, blocklists, etc. * @param configDir where Transmission will look for resume files, blocklists, etc.
* @param messageQueueingEnabled if false, messages will be dumped to stderr * @param messageQueueingEnabled if false, messages will be dumped to stderr
* @param settings libtransmission settings * @param settings libtransmission settings
@@ -265,8 +264,7 @@ void tr_sessionSaveSettings (tr_session * session,
* @see tr_sessionLoadSettings () * @see tr_sessionLoadSettings ()
* @see tr_getDefaultConfigDir () * @see tr_getDefaultConfigDir ()
*/ */
tr_session * tr_sessionInit (const char * tag, tr_session * tr_sessionInit (const char * configDir,
const char * configDir,
bool messageQueueingEnabled, bool messageQueueingEnabled,
struct tr_variant * settings); struct tr_variant * settings);

View File

@@ -361,7 +361,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[tbString UTF8String]); [tbString UTF8String]);
const char * configDir = tr_getDefaultConfigDir("Transmission"); const char * configDir = tr_getDefaultConfigDir("Transmission");
fLib = tr_sessionInit("macosx", configDir, YES, &settings); fLib = tr_sessionInit(configDir, YES, &settings);
tr_variantFree(&settings); tr_variantFree(&settings);
fConfigDirectory = [[NSString alloc] initWithUTF8String: configDir]; fConfigDirectory = [[NSString alloc] initWithUTF8String: configDir];

View File

@@ -351,7 +351,7 @@ Session::start ()
tr_variant settings; tr_variant settings;
tr_variantInitDict (&settings, 0); tr_variantInitDict (&settings, 0);
tr_sessionLoadSettings (&settings, myConfigDir.toUtf8 ().constData (), "qt"); tr_sessionLoadSettings (&settings, myConfigDir.toUtf8 ().constData (), "qt");
mySession = tr_sessionInit ("qt", myConfigDir.toUtf8 ().constData (), true, &settings); mySession = tr_sessionInit (myConfigDir.toUtf8 ().constData (), true, &settings);
tr_variantFree (&settings); tr_variantFree (&settings);
myRpc.start (mySession); myRpc.start (mySession);