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

Cleanup g_strfreev() to auto_gcharv

Browse Source 
Include some additional minor cleanups
This commit is contained in:
John Hernandez
2023-07-13 16:31:31 +02:00
parent 029f1caa52
commit 865a056315
16 changed files with 165 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/config/preferences.c
View File

@@ -216,12 +216,11 @@ _prefs_load(void)
room_trigger_ac = autocomplete_new();
gsize len = 0;
gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
auto_gcharv gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
for (int i = 0; i < len; i++) {
autocomplete_add(room_trigger_ac, triggers[i]);
}
g_strfreev(triggers);
}
/* Clean up after _prefs_load() */
@@ -333,7 +332,7 @@ prefs_message_get_triggers(const char* const message)
auto_gchar gchar* message_lower = g_utf8_strdown(message, -1);
gsize len = 0;
gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
auto_gcharv gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
for (int i = 0; i < len; i++) {
auto_gchar gchar* trigger_lower = g_utf8_strdown(triggers[i], -1);
@@ -342,8 +341,6 @@ prefs_message_get_triggers(const char* const message)
}
}
g_strfreev(triggers);
return result;
}
@@ -862,12 +859,6 @@ prefs_remove_plugin(const char* const name)
_save_prefs();
}
void
prefs_free_plugins(gchar** plugins)
{
g_strfreev(plugins);
}
void
prefs_set_occupants_size(gint value)
{
@@ -1316,14 +1307,12 @@ prefs_get_room_notify_triggers(void)
{
GList* result = NULL;
gsize len = 0;
gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
auto_gcharv gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
for (int i = 0; i < len; i++) {
result = g_list_append(result, strdup(triggers[i]));
}
g_strfreev(triggers);
return result;
}
@@ -1665,7 +1654,7 @@ prefs_get_aliases(void)
} else {
GList* result = NULL;
gsize len;
gchar** keys = g_key_file_get_keys(prefs, PREF_GROUP_ALIAS, &len, NULL);
auto_gcharv gchar** keys = g_key_file_get_keys(prefs, PREF_GROUP_ALIAS, &len, NULL);
for (int i = 0; i < len; i++) {
char* name = keys[i];
@@ -1680,8 +1669,6 @@ prefs_get_aliases(void)
}
}
g_strfreev(keys);
return result;
}
}