aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/airpcap_gui_utils.c13
-rw-r--r--ui/gtk/capture_dlg.c14
-rw-r--r--ui/gtk/capture_file_dlg.c6
-rw-r--r--ui/gtk/color_edit_dlg.c4
-rw-r--r--ui/gtk/extcap_gtk.c6
-rw-r--r--ui/gtk/funnel_stat.c2
-rw-r--r--ui/gtk/io_stat.c3
-rw-r--r--ui/gtk/mac_lte_stat_dlg.c7
-rw-r--r--ui/gtk/main.c3
-rw-r--r--ui/gtk/main_welcome.c3
-rw-r--r--ui/gtk/prefs_capture.c6
-rw-r--r--ui/gtk/rlc_lte_stat_dlg.c8
12 files changed, 22 insertions, 53 deletions
diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
index c1341eda32..8e46b347b3 100644
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@@ -510,8 +510,7 @@ write_wlan_driver_wep_keys_to_registry(GList* key_list)
/*
* Free the old adapter key collection!
*/
- if (fake_info_if->keysCollection != NULL)
- g_free(fake_info_if->keysCollection);
+ g_free(fake_info_if->keysCollection);
/*
* Set this collection ad the new one
@@ -647,8 +646,7 @@ write_wlan_wep_keys_to_registry(airpcap_if_info_t* info_if, GList* key_list)
/*
* Free the old adapter key collection!
*/
- if (info_if->keysCollection != NULL)
- g_free(info_if->keysCollection);
+ g_free(info_if->keysCollection);
/*
* Set this collection ad the new one
@@ -1028,7 +1026,7 @@ get_airpcap_driver_keys(void)
/* KEY */
tmp_key = airpcap_get_key_string(fake_info_if->keysCollection->Keys[i]);
new_key->key = g_string_new(tmp_key);
- if (tmp_key != NULL) g_free(tmp_key);
+ g_free(tmp_key);
/* BITS */
new_key->bits = (guint) new_key->key->len *4; /* every char is 4 bits in WEP keys (it is an hexadecimal number) */
@@ -1243,7 +1241,7 @@ free_key_list(GList *list)
g_string_free(curr_key->key, TRUE);
if (curr_key->ssid != NULL)
- g_byte_array_free(curr_key->ssid, TRUE);
+ g_byte_array_free(curr_key->ssid, TRUE);
/* free the decryption_key_t structure*/
g_free(curr_key);
@@ -2077,8 +2075,7 @@ airpcap_add_keys_to_driver_from_list(GtkListStore *key_list_store, airpcap_if_in
/*
* Free the old adapter key collection!
*/
- if (fake_if_info->keysCollection != NULL)
- g_free(fake_if_info->keysCollection);
+ g_free(fake_if_info->keysCollection);
/*
* Set this collection ad the new one
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index f1e66cbcce..5f1516695e 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -2480,8 +2480,7 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
device.snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
}
filter_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(filter_cm));
- if (device.cfilter)
- g_free(device.cfilter);
+ g_free(device.cfilter);
g_assert(filter_text != NULL);
device.cfilter = filter_text;
@@ -4523,9 +4522,7 @@ update_properties_all(void)
if (strcmp(device.cfilter, filter_str) != 0) {
/* No, so not all selected interfaces have the same capture
filter. */
- if (filter_str != NULL) {
- g_free(filter_str);
- }
+ g_free(filter_str);
filter_str = NULL;
filter_all = FALSE;
}
@@ -5445,11 +5442,8 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_)
the same as the one the other interfaces we've looked
at have? */
if (strcmp(interface_opts.cfilter, filter_str) != 0) {
- /* No, so not all selected interfaces have the same capture
- filter. */
- if (filter_str != NULL) {
- g_free(filter_str);
- }
+ /* No, so not all selected interfaces have the same capture filter. */
+ g_free(filter_str);
filter_str = NULL;
}
}
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index c1c5d7aac0..5738f232bf 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -930,8 +930,7 @@ file_merge_cmd(GtkWidget *w _U_)
}
if (merge_status != CF_OK) {
- if (rfcode != NULL)
- dfilter_free(rfcode);
+ dfilter_free(rfcode);
g_free(tmpname);
continue;
}
@@ -941,8 +940,7 @@ file_merge_cmd(GtkWidget *w _U_)
/* Try to open the merged capture file. This closes the current file if it succeeds. */
if (cf_open(&cfile, tmpname, WTAP_TYPE_AUTO, TRUE /* temporary file */, &err) != CF_OK) {
/* We couldn't open it; fail. */
- if (rfcode != NULL)
- dfilter_free(rfcode);
+ dfilter_free(rfcode);
g_free(tmpname);
g_string_free(file_name, TRUE);
g_string_free(display_filter, TRUE);
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c
index 66a4563e34..8713af5aad 100644
--- a/ui/gtk/color_edit_dlg.c
+++ b/ui/gtk/color_edit_dlg.c
@@ -448,9 +448,7 @@ color_edit_dlg_ok_cb(GtkWidget *w _U_, gpointer user_data)
1, filter_text, 2, fg_str, 3, bg_str,
4, filter_disabled, -1);
- if (colorf->c_colorfilter != NULL) {
- dfilter_free(colorf->c_colorfilter);
- }
+ dfilter_free(colorf->c_colorfilter);
colorf->c_colorfilter = compiled_filter;
/* Destroy the dialog box. */
diff --git a/ui/gtk/extcap_gtk.c b/ui/gtk/extcap_gtk.c
index cdd7946a2f..0df5526ce3 100644
--- a/ui/gtk/extcap_gtk.c
+++ b/ui/gtk/extcap_gtk.c
@@ -741,8 +741,7 @@ GtkWidget *extcap_create_gtk_multicheckwidget(extcap_arg *argument,
EXTCAP_GTK_MULTI_COL_ACTIVATABLE, v->enabled, -1);
}
- if (prev_list != NULL)
- g_strfreev(prev_list);
+ g_strfreev(prev_list);
renderer = gtk_cell_renderer_text_new();
togglerenderer = gtk_cell_renderer_toggle_new();
@@ -866,8 +865,7 @@ GSList *extcap_populate_gtk_vbox(GList *arguments, GtkWidget *vbox,
gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.1f);
item = extcap_create_gtk_fileselect(arg_iter, prev_map, default_str);
- if (default_str != NULL)
- g_free(default_str);
+ g_free(default_str);
break;
case EXTCAP_ARG_TIMESTAMP:
default_str = NULL;
diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c
index 29e36bce8f..d9c3f2fd21 100644
--- a/ui/gtk/funnel_stat.c
+++ b/ui/gtk/funnel_stat.c
@@ -516,7 +516,7 @@ static gboolean funnel_open_file(funnel_ops_id_t *ops_id _U_, const char* fname,
/* This closes the current file if it succeeds. */
if (cf_open(&cfile, fname, WTAP_TYPE_AUTO, FALSE, &err) != CF_OK) {
*err_str = g_strdup(g_strerror(err));
- if (rfcode != NULL) dfilter_free(rfcode);
+ dfilter_free(rfcode);
return FALSE;
}
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index 2f16332506..a5afd6fcbe 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -1826,8 +1826,7 @@ filter_callback(GtkWidget *widget, gpointer user_data)
io_stat_redraw(gio->io);
return;
}
- if (dfilter != NULL)
- dfilter_free(dfilter);
+ dfilter_free(dfilter);
/* ok, we have a valid filter and the graph is active.
first just try to delete any previous settings and then apply
diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
index 5bb94726db..6986a53c00 100644
--- a/ui/gtk/mac_lte_stat_dlg.c
+++ b/ui/gtk/mac_lte_stat_dlg.c
@@ -1052,12 +1052,7 @@ static void gtk_mac_lte_stat_init(const char *opt_arg, void *userdata _U_)
hs->ep_list = NULL;
/* Copy filter (so can be used for window title at reset) */
- if (filter) {
- hs->filter = g_strdup(filter);
- }
- else {
- hs->filter = NULL;
- }
+ hs->filter = g_strdup(filter);
/* Set title */
display_name = cf_get_display_name(&cfile);
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 1343ef290e..9777d4468f 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2584,8 +2584,7 @@ main(int argc, char *argv[])
g_free(global_commandline_info.cf_name);
global_commandline_info.cf_name = NULL;
} else {
- if (rfcode != NULL)
- dfilter_free(rfcode);
+ dfilter_free(rfcode);
cfile.rfcode = NULL;
show_main_window(FALSE);
/* Don't call check_and_warn_user_startup(): we did it above */
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 3ad072998f..202ece3b7a 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -1123,8 +1123,7 @@ fill_capture_box(void)
label_text = g_strdup_printf("Error = %d; this \"can't happen\".", error);
break;
}
- if (err_str != NULL)
- g_free(err_str);
+ g_free(err_str);
w = gtk_label_new(label_text);
gtk_label_set_markup(GTK_LABEL(w), label_text);
gtk_label_set_line_wrap(GTK_LABEL(w), TRUE);
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index 4f938b655a..03a78a52cb 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -273,10 +273,6 @@ capture_prefs_fetch(GtkWidget *w)
auto_scroll_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), AUTO_SCROLL_KEY);
show_info_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SHOW_INFO_KEY);
- if (prefs.capture_device != NULL) {
- g_free(prefs.capture_device);
- prefs.capture_device = NULL;
- }
if_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(if_cbxe)))));
/* Strip out white space */
g_strstrip(if_text);
@@ -291,6 +287,8 @@ capture_prefs_fetch(GtkWidget *w)
/* Ensure capture device is not NULL */
if (if_text == NULL)
if_text = g_strdup("");
+
+ g_free(prefs.capture_device);
prefs.capture_device = if_text;
prefs.capture_prom_mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(promisc_cb));
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index 16939fa10e..fde6cf5276 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -1308,13 +1308,7 @@ static void gtk_rlc_lte_stat_init(const char *opt_arg, void *userdata _U_)
hs->ep_list = NULL;
/* Copy filter (so can be used for window title at reset) */
- if (filter) {
- hs->filter = g_strdup(filter);
- }
- else {
- hs->filter = NULL;
- }
-
+ hs->filter = g_strdup(filter);
/* Set title */
display_name = cf_get_display_name(&cfile);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 02:11:28 +0000