devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-22 19:26:21 +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

11
src/ui/confwin.c
View File

@@ -340,14 +340,5 @@ confwin_get_string(ProfConfWin* confwin)
{
assert(confwin != NULL);
GString* res = g_string_new("");
char* title = win_get_title((ProfWin*)confwin);
g_string_append(res, title);
free(title);
char* resstr = res->str;
g_string_free(res, FALSE);
return resstr;
return win_get_title((ProfWin*)confwin);
}

4
src/ui/console.c
View File

@@ -310,9 +310,7 @@ _room_triggers_to_string(GList* triggers)
}
}
char* result = triggers_str->str;
g_string_free(triggers_str, FALSE);
return result;
return g_string_free(triggers_str, FALSE);
}
void

5
src/ui/privwin.c
View File

@@ -286,8 +286,5 @@ privwin_get_string(ProfPrivateWin* privwin)
g_string_append_printf(res, ", %d unread", privwin->unread);
}
char* resstr = res->str;
g_string_free(res, FALSE);
return resstr;
return g_string_free(res, FALSE);
}

16
src/ui/window.c
View File

@@ -337,9 +337,7 @@ win_get_title(ProfWin* window)
g_string_append(title, mucwin->roomjid);
}
char* title_str = title->str;
g_string_free(title, FALSE);
return title_str;
return g_string_free(title, FALSE);
}
if (window->type == WIN_CONFIG) {
ProfConfWin* confwin = (ProfConfWin*)window;
@@ -349,9 +347,7 @@ win_get_title(ProfWin* window)
if (confwin->form->modified) {
g_string_append(title, " *");
}
char* title_str = title->str;
g_string_free(title, FALSE);
return title_str;
return g_string_free(title, FALSE);
}
if (window->type == WIN_PRIVATE) {
ProfPrivateWin* privatewin = (ProfPrivateWin*)window;
@@ -500,9 +496,7 @@ win_to_string(ProfWin* window)
ProfPluginWin* pluginwin = (ProfPluginWin*)window;
GString* gstring = g_string_new("");
g_string_append_printf(gstring, "Plugin: %s", pluginwin->tag);
char* res = gstring->str;
g_string_free(gstring, FALSE);
return res;
return g_string_free(gstring, FALSE);
}
case WIN_VCARD:
{
@@ -2320,7 +2314,5 @@ win_quote_autocomplete(ProfWin* window, const char* const input, gboolean previo
g_free(quoted_result);
g_strfreev(parts);
result = replace_with->str;
g_string_free(replace_with, FALSE);
return result;
return g_string_free(replace_with, FALSE);
}