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

Remove prefs_free_string()

Browse Source 
It just does a free.
Related to b580b9ef11
This commit is contained in:
Michael Vetter
2020-07-02 11:31:54 +02:00
parent 9774b0c550
commit e5ac12afa6
19 changed files with 138 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/config/preferences.c
View File

@@ -104,7 +104,7 @@ static void _prefs_load(void)
char *message = g_key_file_get_string(prefs, PREF_GROUP_PRESENCE, "autoaway.message", NULL);
g_key_file_set_string(prefs, PREF_GROUP_PRESENCE, "autoaway.awaymessage", message);
g_key_file_remove_key(prefs, PREF_GROUP_PRESENCE, "autoaway.message", NULL);
prefs_free_string(message);
g_free(message);
}
// migrate pre 0.5.0 time settings
@@ -123,7 +123,7 @@ static void _prefs_load(void)
g_key_file_set_string(prefs, PREF_GROUP_UI, "time.private", val);
g_key_file_set_string(prefs, PREF_GROUP_UI, "time.xmlconsole", val);
g_key_file_remove_key(prefs, PREF_GROUP_UI, "time", NULL);
prefs_free_string(time);
g_free(time);
}
// move pre 0.5.0 notify settings
@@ -137,7 +137,7 @@ static void _prefs_load(void)
g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room", FALSE);
g_key_file_set_boolean(prefs, PREF_GROUP_NOTIFICATIONS, "room.mention", TRUE);
}
prefs_free_string(value);
g_free(value);
}
// move pre 0.6.0 titlebar settings to wintitle
@@ -569,12 +569,6 @@ prefs_get_string_list_with_option(preference_t pref, gchar *option)
}
}
void
prefs_free_string(char *pref)
{
g_free(pref);
}
void
prefs_set_string(preference_t pref, char *value)
{
@@ -632,7 +626,7 @@ prefs_get_tls_certpath(void)
char *setting = g_key_file_get_string(prefs, group, key, NULL);
if (g_strcmp0(setting, "none") == 0) {
prefs_free_string(setting);
g_free(setting);
return NULL;
}
@@ -657,7 +651,7 @@ prefs_get_tls_certpath(void)
}
char *result = strdup(setting);
prefs_free_string(setting);
g_free(setting);
return result;
}