devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 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

10
src/xmpp/roster_list.c
View File

@@ -188,10 +188,7 @@ roster_get_display_name(const char* const barejid)
g_string_append(result, barejid);
}
char* result_str = result->str;
g_string_free(result, FALSE);
return result_str;
return g_string_free(result, FALSE);
}
char*
@@ -223,10 +220,7 @@ roster_get_msg_display_name(const char* const barejid, const char* const resourc
g_string_append(result, resource);
}
char* result_str = result->str;
g_string_free(result, FALSE);
return result_str;
return g_string_free(result, FALSE);
}
gboolean