diff options
Diffstat (limited to 'ui')
30 files changed, 62 insertions, 151 deletions
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 3fb1fbb109..4d826da89e 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -565,11 +565,7 @@ comparestat_init(const char *opt_arg, void *userdata _U_) cs->zebra_time.nsecs = 1; cs->nr_set = g_hash_table_new(NULL, NULL); - if (filter) { - cs->filter = g_strdup(filter); - } else { - cs->filter = NULL; - } + cs->filter = g_strdup(filter); /* create a Hash to count the packets with the same ip.id */ cs->packet_set = g_hash_table_new_full(NULL, NULL, NULL, frame_info_free); diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index 6b7334b223..294493348e 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -293,11 +293,7 @@ httpstat_init(const char *opt_arg, void *userdata _U_) } sp = g_new(httpstat_t, 1); - if (filter) { - sp->filter = g_strdup(filter); - } else { - sp->filter = NULL; - } + sp->filter = g_strdup(filter); /*g_hash_table_foreach(http_status, (GHFunc)http_reset_hash_responses, NULL);*/ diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index 9102cf32fe..db0e3ffda3 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -283,8 +283,7 @@ icmpstat_init(const char *opt_arg, void *userdata _U_) memset(icmpstat, 0, sizeof(icmpstat_t)); icmpstat->min_msecs = 1.0 * G_MAXUINT; - if (filter) - icmpstat->filter = g_strdup(filter); + icmpstat->filter = g_strdup(filter); /* It is possible to create a filter and attach it to the callbacks. Then the * callbacks would only be invoked if the filter matched. @@ -300,8 +299,7 @@ icmpstat_init(const char *opt_arg, void *userdata _U_) TL_REQUIRES_NOTHING, icmpstat_reset, icmpstat_packet, icmpstat_draw); if (error_string) { /* error, we failed to attach to the tap. clean up */ - if (icmpstat->filter) - g_free(icmpstat->filter); + g_free(icmpstat->filter); g_free(icmpstat); fprintf(stderr, "tshark: Couldn't register icmp,srt tap: %s\n", diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 6c2a59d0d7..4a7bf161d0 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -284,8 +284,7 @@ icmpv6stat_init(const char *opt_arg, void *userdata _U_) memset(icmpv6stat, 0, sizeof(icmpv6stat_t)); icmpv6stat->min_msecs = 1.0 * G_MAXUINT; - if (filter) - icmpv6stat->filter = g_strdup(filter); + icmpv6stat->filter = g_strdup(filter); /* It is possible to create a filter and attach it to the callbacks. Then the * callbacks would only be invoked if the filter matched. @@ -301,8 +300,7 @@ icmpv6stat_init(const char *opt_arg, void *userdata _U_) TL_REQUIRES_NOTHING, icmpv6stat_reset, icmpv6stat_packet, icmpv6stat_draw); if (error_string) { /* error, we failed to attach to the tap. clean up */ - if (icmpv6stat->filter) - g_free(icmpv6stat->filter); + g_free(icmpv6stat->filter); g_free(icmpv6stat); fprintf(stderr, "tshark: Couldn't register icmpv6,srt tap: %s\n", diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index d3bc760e76..b9035a3e73 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -1202,8 +1202,7 @@ iostat_draw(void *arg) } if (last_row) { - if (fmt) - g_free(fmt); + g_free(fmt); } else { item_in_column[j] = item_in_column[j]->next; } diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index 6fe4096a69..3ef2c56814 100644 --- a/ui/cli/tap-protohierstat.c +++ b/ui/cli/tap-protohierstat.c @@ -184,12 +184,7 @@ protohierstat_init(const char *opt_arg, void *userdata _U_) } rs = new_phs_t(NULL); - - if (filter) { - rs->filter = g_strdup(filter); - } else { - rs->filter = NULL; - } + rs->filter = g_strdup(filter); error_string = register_tap_listener("frame", rs, filter, TL_REQUIRES_PROTO_TREE, NULL, protohierstat_packet, protohierstat_draw); if (error_string) { diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 20d15e4640..163fe1271c 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -245,11 +245,7 @@ rtspstat_init(const char *opt_arg, void *userdata _U_) } sp = (rtspstat_t *)g_malloc( sizeof(rtspstat_t) ); - if (filter) { - sp->filter = g_strdup(filter); - } else { - sp->filter = NULL; - } + sp->filter = g_strdup(filter); /*g_hash_table_foreach( rtsp_status, (GHFunc)rtsp_reset_hash_responses, NULL);*/ diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index c1902f1060..75859c13c5 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -422,11 +422,7 @@ sipstat_init(const char *opt_arg, void *userdata _U_) } sp = g_new0(sipstat_t, 1); - if (filter) { - sp->filter = g_strdup(filter); - } else { - sp->filter = NULL; - } + sp->filter = g_strdup(filter); /*g_hash_table_foreach( sip_status, (GHFunc)sip_reset_hash_responses, NULL);*/ diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index b2a0ba46a8..754eeaf3a0 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -245,11 +245,8 @@ wspstat_init(const char *opt_arg, void *userdata _U_) } sp->num_pdus = 16; sp->pdu_stats = g_new(wsp_pdu_t, (sp->num_pdus+1)); - if (filter) { - sp->filter = g_strdup(filter); - } else { - sp->filter = NULL; - } + sp->filter = g_strdup(filter); + for (i=0; i<sp->num_pdus; i++) { sp->pdu_stats[i].packets = 0; 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); diff --git a/ui/iface_lists.c b/ui/iface_lists.c index a989317d11..a1b66745f1 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.c @@ -176,11 +176,7 @@ scan_local_interfaces(void (*update_cb)(void)) continue; } device.name = g_strdup(if_info->name); - if (if_info->friendly_name != NULL) { - device.friendly_name = g_strdup(if_info->friendly_name); - } else { - device.friendly_name = NULL; - } + device.friendly_name = g_strdup(if_info->friendly_name); device.hidden = FALSE; memset(&temp, 0, sizeof(temp)); temp.name = g_strdup(if_info->name); diff --git a/ui/language.c b/ui/language.c index 2bc721aafa..d8da1fef28 100644 --- a/ui/language.c +++ b/ui/language.c @@ -46,8 +46,7 @@ read_language_pref(gchar *key, const gchar *value, void *private_data _U_, gboolean return_range_errors _U_) { if (strcmp(key, LANGUAGE_PREF_LANGUAGE) == 0) { - if (language) - g_free(language); + g_free(language); /* * For backwards compatibility, treat "auto" as meaning "use the * system language". diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c index 3275e16453..5722a264d8 100644 --- a/ui/proto_hier_stats.c +++ b/ui/proto_hier_stats.c @@ -345,10 +345,7 @@ static gboolean stat_node_free(GNode *node, gpointer data _U_) { ph_stats_node_t *stats = (ph_stats_node_t *)node->data; - - if (stats) { - g_free(stats); - } + g_free(stats); return FALSE; } diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 380ef7e357..0336b27d52 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1276,8 +1276,7 @@ void MainWindow::mergeCaptureFile() g_free(in_filenames[1]); if (merge_status != CF_OK) { - if (rfcode != NULL) - dfilter_free(rfcode); + dfilter_free(rfcode); g_free(tmpname); continue; } @@ -1289,8 +1288,7 @@ void MainWindow::mergeCaptureFile() if (cf_open(CaptureFile::globalCapFile(), tmpname, WTAP_TYPE_AUTO, TRUE /* temporary file */, &err) != CF_OK) { /* We couldn't open it; fail. */ CaptureFile::globalCapFile()->window = NULL; - if (rfcode != NULL) - dfilter_free(rfcode); + dfilter_free(rfcode); g_free(tmpname); return; } diff --git a/ui/qt/main_window_preferences_frame.cpp b/ui/qt/main_window_preferences_frame.cpp index 3a40e7033c..3bd0eac6ef 100644 --- a/ui/qt/main_window_preferences_frame.cpp +++ b/ui/qt/main_window_preferences_frame.cpp @@ -226,8 +226,7 @@ void MainWindowPreferencesFrame::on_mainToolbarComboBox_currentIndexChanged(int void MainWindowPreferencesFrame::on_languageComboBox_currentIndexChanged(int index) { - if (language) - g_free(language); + g_free(language); language = g_strdup(ui->languageComboBox->itemData(index).toString().toStdString().c_str()); } diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index c71b116fd7..518bd392bf 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -250,8 +250,7 @@ bool MainWindow::openCaptureFile(QString cf_path, QString read_filter, unsigned dismiss the alert box popped up for the open error, try again. */ CaptureFile::globalCapFile()->window = NULL; - if (rfcode != NULL) - dfilter_free(rfcode); + dfilter_free(rfcode); cf_path.clear(); continue; } diff --git a/ui/recent.c b/ui/recent.c index ce3ab4870f..7aab5e3470 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -1123,9 +1123,7 @@ read_set_recent_pair_static(gchar *key, const gchar *value, } prefs_clear_string_list(col_l); } else if (strcmp(key, RECENT_GUI_FILEOPEN_REMEMBERED_DIR) == 0) { - if (recent.gui_fileopen_remembered_dir) { - g_free (recent.gui_fileopen_remembered_dir); - } + g_free(recent.gui_fileopen_remembered_dir); recent.gui_fileopen_remembered_dir = g_strdup(value); } else if (strcmp(key, RECENT_GUI_TOOLBAR_SHOW) == 0) { recent.gui_additional_toolbars = prefs_get_string_list(value); @@ -1446,11 +1444,7 @@ recent_set_column_width(gint col, gint width) if (!found) { col_w = (col_width_data *) g_malloc(sizeof(col_width_data)); col_w->cfmt = cfmt; - if (cfield) { - col_w->cfield = g_strdup(cfield); - } else { - col_w->cfield = NULL; - } + col_w->cfield = g_strdup(cfield); col_w->width = width; col_w->xalign = COLUMN_XALIGN_DEFAULT; recent.col_width_list = g_list_append(recent.col_width_list, col_w); @@ -1514,11 +1508,7 @@ recent_set_column_xalign(gint col, gchar xalign) if (!found) { col_w = (col_width_data *) g_malloc(sizeof(col_width_data)); col_w->cfmt = cfmt; - if (cfield) { - col_w->cfield = g_strdup(cfield); - } else { - col_w->cfield = NULL; - } + col_w->cfield = g_strdup(cfield); col_w->width = 40; col_w->xalign = xalign; recent.col_width_list = g_list_append(recent.col_width_list, col_w); diff --git a/ui/voip_calls.c b/ui/voip_calls.c index afa816d356..4ab23e18ef 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -1377,25 +1377,21 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, callsinfo->call_active_state = VOIP_ACTIVE; callsinfo->call_state = VOIP_UNKNOWN; copy_address(&(callsinfo->initial_speaker),&(pinfo->src)); - callsinfo->selected=FALSE; - callsinfo->start_fd=pinfo->fd; - callsinfo->start_rel_ts=pinfo->rel_ts; - callsinfo->protocol=VOIP_ISUP; - if (pi->calling_number!=NULL) { - callsinfo->from_identity=g_strdup(pi->calling_number); - } - if (pi->called_number!=NULL) { - callsinfo->to_identity=g_strdup(pi->called_number); - } - callsinfo->prot_info=g_malloc(sizeof(isup_calls_info_t)); + callsinfo->selected = FALSE; + callsinfo->start_fd = pinfo->fd; + callsinfo->start_rel_ts = pinfo->rel_ts; + callsinfo->protocol = VOIP_ISUP; + callsinfo->from_identity = g_strdup(pi->calling_number); + callsinfo->to_identity = g_strdup(pi->called_number); + callsinfo->prot_info = g_malloc(sizeof(isup_calls_info_t)); callsinfo->free_prot_info = g_free; - tmp_isupinfo=(isup_calls_info_t *)callsinfo->prot_info; - tmp_isupinfo->opc = tapinfo->mtp3_opc; - tmp_isupinfo->dpc = tapinfo->mtp3_dpc; - tmp_isupinfo->ni = tapinfo->mtp3_ni; - tmp_isupinfo->cic = pi->circuit_id; - callsinfo->npackets = 0; - callsinfo->call_num = tapinfo->ncalls++; + tmp_isupinfo = (isup_calls_info_t *)callsinfo->prot_info; + tmp_isupinfo->opc = tapinfo->mtp3_opc; + tmp_isupinfo->dpc = tapinfo->mtp3_dpc; + tmp_isupinfo->ni = tapinfo->mtp3_ni; + tmp_isupinfo->cic = pi->circuit_id; + callsinfo->npackets = 0; + callsinfo->call_num = tapinfo->ncalls++; g_queue_push_tail(tapinfo->callsinfos, callsinfo); } diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index de5fd9c195..84b0174847 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -1323,8 +1323,7 @@ filter_tb_syntax_check(HWND hwnd, TCHAR *filter_text) { SendMessage(hwnd, EM_SETBKGNDCOLOR, (WPARAM) 1, COLOR_WINDOW); return; } else if (dfilter_compile(utf_16to8(strval), &dfp, NULL)) { /* colorize filter string entry */ - if (dfp != NULL) - dfilter_free(dfp); + dfilter_free(dfp); /* Valid (light green) */ SendMessage(hwnd, EM_SETBKGNDCOLOR, 0, RGB(0xe4, 0xff, 0xc7)); /* tango_chameleon_1 */ } else { @@ -1332,7 +1331,7 @@ filter_tb_syntax_check(HWND hwnd, TCHAR *filter_text) { SendMessage(hwnd, EM_SETBKGNDCOLOR, 0, RGB(0xff, 0xcc, 0xcc)); /* tango_scarlet_red_1 */ } - if (strval) g_free(strval); + g_free(strval); } @@ -1365,8 +1364,7 @@ open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { case CDN_FILEOK: /* Fetch the read filter */ cur_ctrl = GetDlgItem(of_hwnd, EWFD_FILTER_EDIT); - if (g_dfilter_str) - g_free(g_dfilter_str); + g_free(g_dfilter_str); g_dfilter_str = filter_tb_get(cur_ctrl); cur_ctrl = GetDlgItem(of_hwnd, EWFD_FORMAT_TYPE); @@ -2220,8 +2218,7 @@ merge_file_hook_proc(HWND mf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { case CDN_FILEOK: /* Fetch the read filter */ cur_ctrl = GetDlgItem(mf_hwnd, EWFD_FILTER_EDIT); - if (g_dfilter_str) - g_free(g_dfilter_str); + g_free(g_dfilter_str); g_dfilter_str = filter_tb_get(cur_ctrl); cur_ctrl = GetDlgItem(mf_hwnd, EWFD_MERGE_CHRONO_BTN); |