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

7
src/tools/autocomplete.c
View File

@@ -314,7 +314,6 @@ autocomplete_complete(Autocomplete ac, const gchar* search_str, gboolean quote,
static char*
_autocomplete_param_common(const char* const input, char* command, autocomplete_func func, Autocomplete ac, gboolean quote, gboolean previous, void* context)
{
GString* auto_msg;
char* command_cpy;
char* result = NULL;
int len;
@@ -344,11 +343,7 @@ _autocomplete_param_common(const char* const input, char* command, autocomplete_
}
if (found) {
auto_msg = g_string_new(command_cpy);
g_string_append(auto_msg, found);
free(found);
result = auto_msg->str;
g_string_free(auto_msg, FALSE);
result = g_strdup_printf("%s%s", command_cpy, found);
}
}
free(command_cpy);

6
src/tools/parser.c
View File

@@ -295,7 +295,6 @@ get_start(const char* const string, int tokens)
GString* result = g_string_new("");
int length = g_utf8_strlen(string, -1);
gboolean in_quotes = FALSE;
char* result_str = NULL;
int num_tokens = 0;
// include first token
@@ -325,10 +324,7 @@ get_start(const char* const string, int tokens)
}
}
result_str = result->str;
g_string_free(result, FALSE);
return result_str;
return g_string_free(result, FALSE);
}
GHashTable*