diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
| commit | 62f60df6b4966d4e3d7f478284768115ef150b20 (patch) | |
| tree | 259b574936077d87b88ed6d0429ba317078e0fcc /gtk/prefs_column.c | |
| parent | 7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (diff) | |
| download | wireshark-62f60df6b4966d4e3d7f478284768115ef150b20.tar.gz wireshark-62f60df6b4966d4e3d7f478284768115ef150b20.tar.bz2 wireshark-62f60df6b4966d4e3d7f478284768115ef150b20.zip | |
From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27718
Diffstat (limited to 'gtk/prefs_column.c')
| -rw-r--r-- | gtk/prefs_column.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/prefs_column.c b/gtk/prefs_column.c index d8ea3de390..427708ad6e 100644 --- a/gtk/prefs_column.c +++ b/gtk/prefs_column.c @@ -351,9 +351,7 @@ column_list_delete_cb(GtkWidget *w _U_, gpointer data) { cfmt = (fmt_data *) clp->data; g_free(cfmt->title); g_free(cfmt->fmt); - if (cfmt->custom_field) { - g_free (cfmt->custom_field); - } + g_free(cfmt->custom_field); g_free(cfmt); prefs.col_list = g_list_remove_link(prefs.col_list, clp); @@ -406,9 +404,7 @@ column_field_changed_cb(GtkEditable *te, gpointer data) { fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), field); gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, fmt, -1); g_free(fmt); - if (cfmt->custom_field) { - g_free(cfmt->custom_field); - } + g_free(cfmt->custom_field); cfmt->custom_field = field; } cfile.cinfo.columns_changed = TRUE; |