mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-25 03:17:52 +02:00
Use g_string_free_and_steal () more
Now that there is g_string_free_and_steal (), we can use it instead of the older g_string_free (_, FALSE). Make sure to use its return value while doing so, as opposed to manually accessing string->str, to avoid compiler warnings and make the intent more explicit. This is all done in preparation for making g_string_free (_, FALSE) warn on unused return value much like g_string_free_and_steal (), which will happen in the next commit. Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
This commit is contained in:
@@ -709,8 +709,8 @@ key_state_serialise (KeyState *state)
|
||||
gsize size;
|
||||
gsize i;
|
||||
|
||||
data = state->strinfo->str;
|
||||
size = state->strinfo->len;
|
||||
data = g_string_free_and_steal (g_steal_pointer (&state->strinfo));
|
||||
|
||||
words = data;
|
||||
for (i = 0; i < size / sizeof (guint32); i++)
|
||||
@@ -720,9 +720,6 @@ key_state_serialise (KeyState *state)
|
||||
data, size, TRUE,
|
||||
g_free, data);
|
||||
|
||||
g_string_free (state->strinfo, FALSE);
|
||||
state->strinfo = NULL;
|
||||
|
||||
g_variant_builder_add (&builder, "(y@au)",
|
||||
state->is_flags ? 'f' :
|
||||
state->is_enum ? 'e' : 'c',
|
||||
|
Reference in New Issue
Block a user