Commit 38b53eed authored by Behdad Esfahbod's avatar Behdad Esfahbod Committed by Behdad Esfahbod
Browse files

Cleanup. Use return value of g_string_free(...). (#343548, Chris Wilson)

2006-06-01  Behdad Esfahbod  <behdad@gnome.org>

        * glib/gkeyfile.c (g_key_file_to_data),
        (g_key_file_parse_value_as_comment),
        (g_key_file_parse_comment_as_value):
        * glib/gscanner.c (g_scanner_get_token_ll): Cleanup. Use return
        value of g_string_free(...). (#343548, Chris Wilson)
parent 01e5d78f
2006-06-01 Behdad Esfahbod <behdad@gnome.org>
* glib/gkeyfile.c (g_key_file_to_data),
(g_key_file_parse_value_as_comment),
(g_key_file_parse_comment_as_value):
* glib/gscanner.c (g_scanner_get_token_ll): Cleanup. Use return
value of g_string_free(...). (#343548, Chris Wilson)
2006-05-28 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_parse_context_parse):
......
2006-06-01 Behdad Esfahbod <behdad@gnome.org>
* glib/gkeyfile.c (g_key_file_to_data),
(g_key_file_parse_value_as_comment),
(g_key_file_parse_comment_as_value):
* glib/gscanner.c (g_scanner_get_token_ll): Cleanup. Use return
value of g_string_free(...). (#343548, Chris Wilson)
2006-05-28 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_parse_context_parse):
......
......@@ -929,7 +929,6 @@ g_key_file_to_data (GKeyFile *key_file,
GError **error)
{
GString *data_string;
gchar *data;
GList *group_node, *key_file_node;
g_return_val_if_fail (key_file != NULL, NULL);
......@@ -967,11 +966,7 @@ g_key_file_to_data (GKeyFile *key_file,
if (length)
*length = data_string->len;
data = data_string->str;
g_string_free (data_string, FALSE);
return data;
return g_string_free (data_string, FALSE);
}
/**
......@@ -3514,7 +3509,7 @@ g_key_file_parse_value_as_comment (GKeyFile *key_file,
const gchar *value)
{
GString *string;
gchar **lines, *comment;
gchar **lines;
gsize i;
string = g_string_sized_new (512);
......@@ -3530,11 +3525,7 @@ g_key_file_parse_value_as_comment (GKeyFile *key_file,
}
g_strfreev (lines);
comment = string->str;
g_string_free (string, FALSE);
return comment;
return g_string_free (string, FALSE);
}
static gchar *
......@@ -3542,7 +3533,7 @@ g_key_file_parse_comment_as_value (GKeyFile *key_file,
const gchar *comment)
{
GString *string;
gchar **lines, *value;
gchar **lines;
gsize i;
string = g_string_sized_new (512);
......@@ -3554,11 +3545,7 @@ g_key_file_parse_comment_as_value (GKeyFile *key_file,
lines[i + 1] == NULL? "" : "\n");
g_strfreev (lines);
value = string->str;
g_string_free (string, FALSE);
return value;
return g_string_free (string, FALSE);
}
#define __G_KEY_FILE_C__
......
......@@ -1705,8 +1705,7 @@ g_scanner_get_token_ll (GScanner *scanner,
if (gstring)
{
value.v_string = gstring->str;
g_string_free (gstring, FALSE);
value.v_string = g_string_free (gstring, FALSE);
gstring = NULL;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment