diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-05-13 12:45:16 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-05-13 19:46:45 +0000 |
commit | 3a0dd69d04b4a4202fe02ac8fe25f4e408c524e8 (patch) | |
tree | c370ad6e49ba206a1e0ccf876b24966dbbed1642 /ui | |
parent | bd166c2b089ad16a3caa7ae6048567af36f73826 (diff) |
Get rid of some GTK+-only stuff.
Change-Id: I841a1cdb637f37673466e4d065474c0f7e2dfc56
Reviewed-on: https://code.wireshark.org/review/27512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/cli/tap-srt.c | 4 | ||||
-rw-r--r-- | ui/qt/service_response_time_dialog.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c index ff8a6e2e93..9470a6b140 100644 --- a/ui/cli/tap-srt.c +++ b/ui/cli/tap-srt.c @@ -116,7 +116,7 @@ init_srt_tables(register_srt_t* srt, const char *filter) error_string = register_tap_listener(get_srt_tap_listener_name(srt), &ui->data, filter, 0, NULL, get_srt_packet_func(srt), srt_draw); if (error_string) { - free_srt_table(srt, global_srt_array, NULL, NULL); + free_srt_table(srt, global_srt_array); g_free(ui); fprintf(stderr, "tshark: Couldn't register srt tap: %s\n", error_string->str); g_string_free(error_string, TRUE); @@ -144,7 +144,7 @@ dissector_srt_init(const char *opt_arg, void* userdata) /* Need to create the SRT array now */ global_srt_array = g_array_new(FALSE, TRUE, sizeof(srt_stat_table*)); - srt_table_dissector_init(srt, global_srt_array, NULL, NULL); + srt_table_dissector_init(srt, global_srt_array); init_srt_tables(srt, filter); } diff --git a/ui/qt/service_response_time_dialog.cpp b/ui/qt/service_response_time_dialog.cpp index 9c02fbb6af..467c078e3d 100644 --- a/ui/qt/service_response_time_dialog.cpp +++ b/ui/qt/service_response_time_dialog.cpp @@ -204,7 +204,7 @@ ServiceResponseTimeDialog::ServiceResponseTimeDialog(QWidget &parent, CaptureFil ServiceResponseTimeDialog::~ServiceResponseTimeDialog() { if (srt_data_.srt_array) { - free_srt_table(srt_, srt_data_.srt_array, NULL, NULL); + free_srt_table(srt_, srt_data_.srt_array); g_array_free(srt_data_.srt_array, TRUE); } } @@ -232,7 +232,7 @@ void ServiceResponseTimeDialog::tapReset(void *srtd_ptr) ServiceResponseTimeDialog *srt_dlg = static_cast<ServiceResponseTimeDialog *>(srtd->user_data); if (!srt_dlg) return; - reset_srt_table(srtd->srt_array, NULL, NULL); + reset_srt_table(srtd->srt_array); srt_dlg->statsTreeWidget()->clear(); } @@ -269,7 +269,7 @@ void ServiceResponseTimeDialog::endRetapPackets() void ServiceResponseTimeDialog::fillTree() { if (srt_data_.srt_array) { - free_srt_table(srt_, srt_data_.srt_array, NULL, NULL); + free_srt_table(srt_, srt_data_.srt_array); g_array_free(srt_data_.srt_array, TRUE); } srt_data_.srt_array = g_array_new(FALSE, TRUE, sizeof(srt_stat_table*)); @@ -277,7 +277,7 @@ void ServiceResponseTimeDialog::fillTree() provideParameterData(); - srt_table_dissector_init(srt_, srt_data_.srt_array, NULL, NULL); + srt_table_dissector_init(srt_, srt_data_.srt_array); QString display_filter = displayFilter(); if (!registerTapListener(get_srt_tap_listener_name(srt_), |