luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 13:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib/*: Use g_list_free_full()

Browse Source
This commit is contained in:
Javier Jardón 2012-01-02 16:10:35 +01:00
parent 928d2cea61
commit 2ae83e116b
4 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
glib/gbookmarkfile.c
View File

@ -359,21 +359,8 @@ bookmark_metadata_free (BookmarkMetadata *metadata)
g_free (metadata->mime_type); g_free (metadata->mime_type);
if (metadata->groups) g_list_free_full (metadata->groups, g_free);
{ g_list_free_full (metadata->applications, (GDestroyNotify) bookmark_app_info_free);
g_list_foreach (metadata->groups,
(GFunc) g_free,
NULL);
g_list_free (metadata->groups);
}
if (metadata->applications)
{
g_list_foreach (metadata->applications,
(GFunc) bookmark_app_info_free,
NULL);
g_list_free (metadata->applications);
}
g_hash_table_destroy (metadata->apps_by_name); g_hash_table_destroy (metadata->apps_by_name);
@ -687,15 +674,8 @@ g_bookmark_file_clear (GBookmarkFile *bookmark)
g_free (bookmark->title); g_free (bookmark->title);
g_free (bookmark->description); g_free (bookmark->description);
if (bookmark->items) g_list_free_full (bookmark->items, (GDestroyNotify) bookmark_item_free);
{ bookmark->items = NULL;
g_list_foreach (bookmark->items,
(GFunc) bookmark_item_free,
NULL);
g_list_free (bookmark->items);
bookmark->items = NULL;
}
if (bookmark->items_by_uri) if (bookmark->items_by_uri)
{ {
@ -2933,14 +2913,8 @@ g_bookmark_file_set_groups (GBookmarkFile *bookmark,
if (!item->metadata) if (!item->metadata)
item->metadata = bookmark_metadata_new (); item->metadata = bookmark_metadata_new ();
if (item->metadata->groups != NULL) g_list_free_full (item->metadata->groups, g_free);
{ item->metadata->groups = NULL;
g_list_foreach (item->metadata->groups,
(GFunc) g_free,
NULL);
g_list_free (item->metadata->groups);
item->metadata->groups = NULL;
}
if (groups) if (groups)
{ {

10
glib/gkeyfile.c
View File

@ -3197,14 +3197,8 @@ g_key_file_set_top_comment (GKeyFile *key_file,
/* Note all keys must be comments at the top of /* Note all keys must be comments at the top of
* the file, so we can just free it all. * the file, so we can just free it all.
*/ */
if (group->key_value_pairs != NULL) g_list_free_full (group->key_value_pairs, (GDestroyNotify) g_key_file_key_value_pair_free);
{ group->key_value_pairs = NULL;
g_list_foreach (group->key_value_pairs,
(GFunc) g_key_file_key_value_pair_free,
NULL);
g_list_free (group->key_value_pairs);
group->key_value_pairs = NULL;
}
if (comment == NULL) if (comment == NULL)
return TRUE; return TRUE;

3
glib/goption.c
View File

@ -356,8 +356,7 @@ void g_option_context_free (GOptionContext *context)
{ {
g_return_if_fail (context != NULL); g_return_if_fail (context != NULL);
g_list_foreach (context->groups, (GFunc)g_option_group_free, NULL); g_list_free_full (context->groups, (GDestroyNotify) g_option_group_free);
g_list_free (context->groups);
if (context->main_group) if (context->main_group)
g_option_group_free (context->main_group); g_option_group_free (context->main_group);

15
glib/gregex.c
View File

@ -835,8 +835,7 @@ g_match_info_expand_references (const GMatchInfo *match_info,
result = g_string_sized_new (strlen (string_to_expand)); result = g_string_sized_new (strlen (string_to_expand));
interpolate_replacement (match_info, result, list); interpolate_replacement (match_info, result, list);
g_list_foreach (list, (GFunc)free_interpolation_data, NULL); g_list_free_full (list, (GDestroyNotify) free_interpolation_data);
g_list_free (list);
return g_string_free (result, FALSE); return g_string_free (result, FALSE);
} }
@ -2062,8 +2061,7 @@ g_regex_split_full (const GRegex *regex,
if (tmp_error != NULL) if (tmp_error != NULL)
{ {
g_propagate_error (error, tmp_error); g_propagate_error (error, tmp_error);
g_list_foreach (list, (GFunc)g_free, NULL); g_list_free_full (list, g_free);
g_list_free (list);
match_info->pos = -1; match_info->pos = -1;
return NULL; return NULL;
} }
@ -2385,8 +2383,7 @@ split_replacement (const gchar *replacement,
start = p = expand_escape (replacement, p, data, error); start = p = expand_escape (replacement, p, data, error);
if (p == NULL) if (p == NULL)
{ {
g_list_foreach (list, (GFunc)free_interpolation_data, NULL); g_list_free_full (list, (GDestroyNotify) free_interpolation_data);
g_list_free (list);
free_interpolation_data (data); free_interpolation_data (data);
return NULL; return NULL;
@ -2617,8 +2614,7 @@ g_regex_replace (const GRegex *regex,
if (tmp_error != NULL) if (tmp_error != NULL)
g_propagate_error (error, tmp_error); g_propagate_error (error, tmp_error);
g_list_foreach (list, (GFunc)free_interpolation_data, NULL); g_list_free_full (list, (GDestroyNotify) free_interpolation_data);
g_list_free (list);
return result; return result;
} }
@ -2827,8 +2823,7 @@ g_regex_check_replacement (const gchar *replacement,
if (has_references) if (has_references)
*has_references = interpolation_list_needs_match (list); *has_references = interpolation_list_needs_match (list);
g_list_foreach (list, (GFunc) free_interpolation_data, NULL); g_list_free_full (list, (GDestroyNotify) free_interpolation_data);
g_list_free (list);
return TRUE; return TRUE;
} }