devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Cleanup jid_destroy to auto_jid

Browse Source 
Remove unused variables
Apply minor cleanups
This commit is contained in:
John Hernandez
2023-07-13 15:11:30 +02:00
parent 8304ac86ff
commit 029f1caa52
25 changed files with 125 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/account.c
View File

@@ -108,9 +108,8 @@ account_new(gchar* name, gchar* jid, gchar* password, gchar* eval_password, gboo
new_account->muc_service = muc_service;
if (muc_nick == NULL) {
Jid* jidp = jid_create(new_account->jid);
auto_jid Jid* jidp = jid_create(new_account->jid);
new_account->muc_nick = strdup(jidp->domainpart);
jid_destroy(jidp);
} else {
new_account->muc_nick = muc_nick;
}

13
src/config/accounts.c
View File

@@ -128,7 +128,7 @@ accounts_add(const char* account_name, const char* altdomain, const int port, co
// set account name and resource
const char* barejid = account_name;
auto_gchar gchar* resource = jid_random_resource();
Jid* jid = jid_create(account_name);
auto_jid Jid* jid = jid_create(account_name);
if (jid) {
barejid = jid->barejid;
if (jid->resourcepart) {
@@ -137,7 +137,6 @@ accounts_add(const char* account_name, const char* altdomain, const int port, co
}
if (g_key_file_has_group(accounts, account_name)) {
jid_destroy(jid);
return;
}
@@ -157,7 +156,7 @@ accounts_add(const char* account_name, const char* altdomain, const int port, co
g_key_file_set_string(accounts, account_name, "auth.policy", auth_policy);
}
Jid* jidp = jid_create(barejid);
auto_jid Jid* jidp = jid_create(barejid);
if (jidp->localpart == NULL) {
g_key_file_set_string(accounts, account_name, "muc.nick", jidp->domainpart);
@@ -165,8 +164,6 @@ accounts_add(const char* account_name, const char* altdomain, const int port, co
g_key_file_set_string(accounts, account_name, "muc.nick", jidp->localpart);
}
jid_destroy(jidp);
g_key_file_set_string(accounts, account_name, "presence.last", "online");
g_key_file_set_string(accounts, account_name, "presence.login", "online");
g_key_file_set_integer(accounts, account_name, "priority.online", 0);
@@ -178,8 +175,6 @@ accounts_add(const char* account_name, const char* altdomain, const int port, co
_save_accounts();
autocomplete_add(all_ac, account_name);
autocomplete_add(enabled_ac, account_name);
jid_destroy(jid);
}
int
@@ -459,7 +454,7 @@ accounts_account_exists(const char* const account_name)
void
accounts_set_jid(const char* const account_name, const char* const value)
{
Jid* jid = jid_create(value);
auto_jid Jid* jid = jid_create(value);
if (jid) {
if (accounts_account_exists(account_name)) {
g_key_file_set_string(accounts, account_name, "jid", jid->barejid);
@@ -475,8 +470,6 @@ accounts_set_jid(const char* const account_name, const char* const value)
_save_accounts();
}
jid_destroy(jid);
}
}