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>

1 files changed, 1 insertions, 4 deletions

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 6ae738ca1..fb65d55c5 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -3546,10 +3546,7 @@ g_key_file_get_key_comment (GKeyFile     *key_file,
     }
 
   if (string != NULL)
-    {
-      comment = string->str;
-      g_string_free (string, FALSE);
-    }
+    comment = g_string_free_and_steal (g_steal_pointer (&string));
   else
     comment = NULL;