devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-08-02 16:36:22 +00:00
Code Issues Packages Projects 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

23
src/config/tlscerts.c
View File

@@ -71,12 +71,11 @@ tlscerts_init(void)
certs_ac = autocomplete_new();
gsize len = 0;
gchar** groups = g_key_file_get_groups(tlscerts, &len);
auto_gcharv gchar** groups = g_key_file_get_groups(tlscerts, &len);
for (int i = 0; i < g_strv_length(groups); i++) {
autocomplete_add(certs_ac, groups[i]);
}
g_strfreev(groups);
current_fp = NULL;
}
@@ -116,7 +115,7 @@ tlscerts_list(void)
{
GList* res = NULL;
gsize len = 0;
gchar** groups = g_key_file_get_groups(tlscerts, &len);
auto_gcharv gchar** groups = g_key_file_get_groups(tlscerts, &len);
for (int i = 0; i < g_strv_length(groups); i++) {
char* fingerprint = strdup(groups[i]);
@@ -135,10 +134,6 @@ tlscerts_list(void)
res = g_list_append(res, cert);
}
if (groups) {
g_strfreev(groups);
}
return res;
}
@@ -178,9 +173,9 @@ tlscerts_new(const char* const fingerprint, int version, const char* const seria
cert->pem = strdup(pem);
}
gchar** fields = g_strsplit(subjectname, "/", 0);
auto_gcharv gchar** fields = g_strsplit(subjectname, "/", 0);
for (int i = 0; i < g_strv_length(fields); i++) {
gchar** keyval = g_strsplit(fields[i], "=", 2);
auto_gcharv gchar** keyval = g_strsplit(fields[i], "=", 2);
if (g_strv_length(keyval) == 2) {
if ((g_strcmp0(keyval[0], "C") == 0) || (g_strcmp0(keyval[0], "countryName") == 0)) {
cert->subject_country = strdup(keyval[1]);
@@ -207,13 +202,11 @@ tlscerts_new(const char* const fingerprint, int version, const char* const seria
cert->subject_email = strdup(keyval[1]);
}
}
g_strfreev(keyval);
}
g_strfreev(fields);
fields = g_strsplit(issuername, "/", 0);
for (int i = 0; i < g_strv_length(fields); i++) {
gchar** keyval = g_strsplit(fields[i], "=", 2);
auto_gcharv gchar** fields2 = g_strsplit(issuername, "/", 0);
for (int i = 0; i < g_strv_length(fields2); i++) {
auto_gcharv gchar** keyval = g_strsplit(fields2[i], "=", 2);
if (g_strv_length(keyval) == 2) {
if ((g_strcmp0(keyval[0], "C") == 0) || (g_strcmp0(keyval[0], "countryName") == 0)) {
cert->issuer_country = strdup(keyval[1]);
@@ -240,9 +233,7 @@ tlscerts_new(const char* const fingerprint, int version, const char* const seria
cert->issuer_email = strdup(keyval[1]);
}
}
g_strfreev(keyval);
}
g_strfreev(fields);
return cert;
}