Remove unnecessary NULL checks before g_free(). (#369666, Morten Welinder,
2007-03-09 Matthias Clasen <mclasen@redhat.com> * Everywhere: Remove unnecessary NULL checks before g_free(). (#369666, Morten Welinder, Djihed Afifi) * configure.in: Check for ftw.h svn path=/trunk/; revision=17444
This commit is contained in:
committed by
Matthias Clasen
parent
a1e4554462
commit
82ce59cd0f
@ -103,14 +103,10 @@ gtk_file_info_free (GtkFileInfo *info)
|
||||
{
|
||||
g_return_if_fail (info != NULL);
|
||||
|
||||
if (info->display_name)
|
||||
g_free (info->display_name);
|
||||
if (info->mime_type)
|
||||
g_free (info->mime_type);
|
||||
if (info->display_key)
|
||||
g_free (info->display_key);
|
||||
if (info->icon_name)
|
||||
g_free (info->icon_name);
|
||||
g_free (info->display_name);
|
||||
g_free (info->mime_type);
|
||||
g_free (info->display_key);
|
||||
g_free (info->icon_name);
|
||||
|
||||
g_free (info);
|
||||
}
|
||||
@ -158,8 +154,7 @@ gtk_file_info_set_display_name (GtkFileInfo *info,
|
||||
if (display_name == info->display_name)
|
||||
return;
|
||||
|
||||
if (info->display_name)
|
||||
g_free (info->display_name);
|
||||
g_free (info->display_name);
|
||||
if (info->display_key)
|
||||
{
|
||||
g_free (info->display_key);
|
||||
@ -217,8 +212,7 @@ gtk_file_info_set_mime_type (GtkFileInfo *info,
|
||||
{
|
||||
g_return_if_fail (info != NULL);
|
||||
|
||||
if (info->mime_type)
|
||||
g_free (info->mime_type);
|
||||
g_free (info->mime_type);
|
||||
|
||||
info->mime_type = g_strdup (mime_type);
|
||||
}
|
||||
@ -264,8 +258,7 @@ gtk_file_info_set_icon_name (GtkFileInfo *info,
|
||||
{
|
||||
g_return_if_fail (info != NULL);
|
||||
|
||||
if (info->icon_name)
|
||||
g_free (info->icon_name);
|
||||
g_free (info->icon_name);
|
||||
|
||||
info->icon_name = g_strdup (icon_name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user