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

Adapt to g_string_free glib 2.75.3 change

Browse Source 
glib 2.75.3 changes warning behaviour of `g_string_free()`.
See:
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3219
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3226

Use this opportunity to replace the use of GString with
`g_strdup_printf()` where possible.
Otherwise correctly take the return value of `g_string_free()`
which is nicer anyways.
This commit is contained in:
Michael Vetter
2023-03-17 23:58:33 +01:00
parent e5e8ff221a
commit e59c401c84
17 changed files with 44 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common.c
View File

@@ -293,12 +293,9 @@ get_file_or_linked(char* loc, char* basedir)
// if relative, add basedir
if (!g_str_has_prefix(true_loc, "/") && !g_str_has_prefix(true_loc, "~")) {
GString* base_str = g_string_new(basedir);
g_string_append(base_str, "/");
g_string_append(base_str, true_loc);
char* tmp = g_strdup_printf("%s/%s", basedir, true_loc);
free(true_loc);
true_loc = base_str->str;
g_string_free(base_str, FALSE);
true_loc = tmp;
}
// use given location
} else {
@@ -418,20 +415,20 @@ get_file_paths_recursive(const char* path, GSList** contents)
GDir* directory = g_dir_open(path, 0, NULL);
const gchar* entry = g_dir_read_name(directory);
gchar* full;
while (entry) {
GString* full = g_string_new(path);
if (!g_str_has_suffix(full->str, "/")) {
g_string_append(full, "/");
}
g_string_append(full, entry);
if (is_dir(full->str)) {
get_file_paths_recursive(full->str, contents);
} else if (is_regular_file(full->str)) {
*contents = g_slist_append(*contents, full->str);
if (g_str_has_suffix(path, "/")) {
full = g_strdup_printf("%s%s", path, entry);
} else {
full = g_strdup_printf("%s/%s", path, entry);
}
if (is_dir(full)) {
get_file_paths_recursive(full, contents);
} else if (is_regular_file(full)) {
*contents = g_slist_append(*contents, full);
}
g_string_free(full, FALSE);
entry = g_dir_read_name(directory);
}
}
@@ -569,22 +566,14 @@ _basename_from_url(const char* url)
gchar*
get_expanded_path(const char* path)
{
GString* exp_path = g_string_new("");
gchar* result;
if (g_str_has_prefix(path, "file://")) {
path += strlen("file://");
}
if (strlen(path) >= 2 && path[0] == '~' && path[1] == '/') {
g_string_printf(exp_path, "%s/%s", getenv("HOME"), path + 2);
return g_strdup_printf("%s/%s", getenv("HOME"), path + 2);
} else {
g_string_printf(exp_path, "%s", path);
return g_strdup_printf("%s", path);
}
result = exp_path->str;
g_string_free(exp_path, FALSE);
return result;
}
gchar*