diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-11-24 14:51:13 -0600 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-11-26 00:04:05 +0000 |
| commit | 2ebaa59a3b195c30b1b3aa746c266ee6159fe6f7 (patch) | |
| tree | 977b20e058e48d23571aa1576d8ef0a8935be118 /ui/gtk/flow_graph.c | |
| parent | 5b360a96716eb9aadb91096108c23c047d7bcb70 (diff) | |
Consolidate sequence analysis code.
Move scattered code for seq_analysis_info_t creation and destruction to
tap-sequence-analysis.[ch].
Change-Id: I87c14b1c83105a48d0ab149a3abba71e2a2fe21f
Reviewed-on: https://code.wireshark.org/review/5479
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk/flow_graph.c')
| -rw-r--r-- | ui/gtk/flow_graph.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index 66a6ac5601..c974ef5752 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -64,10 +64,9 @@ static GtkWidget *net_src_dst_rb; /****************************************************************************/ static void flow_graph_data_init(void) { - graph_analysis = (seq_analysis_info_t *)g_malloc0(sizeof(seq_analysis_info_t)); + graph_analysis = sequence_analysis_info_new(); graph_analysis->type = SEQ_ANALYSIS_ANY; graph_analysis->all_packets = TRUE; - graph_analysis->items = g_queue_new(); } @@ -77,13 +76,11 @@ flow_graph_data_init(void) { static void flow_graph_on_destroy(GObject *object _U_, gpointer user_data _U_) { - /* Clean up memory used by tap */ - sequence_analysis_list_free(graph_analysis); - g_assert(graph_analysis != NULL); g_assert(graph_analysis_data != NULL); - g_free(graph_analysis); + /* Clean up memory used by tap */ + sequence_analysis_info_free(graph_analysis); graph_analysis = NULL; g_free(graph_analysis_data); |