aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/capture_dlg.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:06:48 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:06:48 +0000
commit62f60df6b4966d4e3d7f478284768115ef150b20 (patch)
tree259b574936077d87b88ed6d0429ba317078e0fcc /gtk/capture_dlg.c
parent7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (diff)
downloadwireshark-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/capture_dlg.c')
-rw-r--r--gtk/capture_dlg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index f527a42967..95cdd88058 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -2608,10 +2608,8 @@ capture_dlg_prep(gpointer parent_w) {
g_free(entry_text);
return FALSE;
}
- if (global_capture_opts.iface)
- g_free(global_capture_opts.iface);
- if (global_capture_opts.iface_descr)
- g_free(global_capture_opts.iface_descr);
+ g_free(global_capture_opts.iface);
+ g_free(global_capture_opts.iface_descr);
global_capture_opts.iface = g_strdup(if_name);
global_capture_opts.iface_descr = get_interface_descriptive_name(global_capture_opts.iface);
g_free(entry_text);