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

Simplify conf_string_list_{add,remove}() implementations.

Browse Source 
* add can simply do a `memcpy()`.
* in remove we don't have to put the array in a list in order to put it
  back into an array again. Also we don't have to `strdup()` each entry,
  which leads to even less allocations.

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2025-11-12 10:21:08 +01:00
parent 1ede01ed8c
commit b0221f6146
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/config/conflists.c
View File

@@ -66,9 +66,7 @@ conf_string_list_add(GKeyFile* keyfile, const char* const group, const char* con
// Add item to the existing list // Add item to the existing list
const gchar** new_list = g_new(const gchar*, length + 2); const gchar** new_list = g_new(const gchar*, length + 2);
for (gsize i = 0; i < length; ++i) { memcpy(new_list, list, sizeof(list[0]) * length);
new_list[i] = list[i];
}
new_list[length] = item; new_list[length] = item;
new_list[length + 1] = NULL; new_list[length + 1] = NULL;
@@ -89,33 +87,28 @@ conf_string_list_remove(GKeyFile* keyfile, const char* const group, const char*
return FALSE; return FALSE;
} }
GList* glist = NULL; gsize new_length = 0;
const gchar** new_list = g_new(const gchar*, length + 1);
gboolean deleted = FALSE; gboolean deleted = FALSE;
for (int i = 0; i < length; i++) { for (gsize i = 0; i < length; i++) {
if (strcmp(list[i], item) == 0) { if (strcmp(list[i], item) == 0) {
deleted = TRUE; deleted = TRUE;
continue; continue;
} }
glist = g_list_append(glist, strdup(list[i])); new_list[new_length++] = list[i];
} }
new_list[new_length] = NULL;
if (deleted) { if (deleted) {
if (g_list_length(glist) == 0) { if (new_length == 0) {
g_key_file_remove_key(keyfile, group, key, NULL); g_key_file_remove_key(keyfile, group, key, NULL);
} else { } else {
const gchar* new_list[g_list_length(glist) + 1]; g_key_file_set_string_list(keyfile, group, key, new_list, new_length);
int i = 0;
for (GList* curr = glist; curr; curr = g_list_next(curr)) {
new_list[i++] = curr->data;
}
new_list[i] = NULL;
g_key_file_set_string_list(keyfile, group, key, new_list, g_list_length(glist));
} }
} }
g_list_free_full(glist, g_free); g_free(new_list);
return deleted; return deleted;
} }