Allow "capture info data" to not be a singleton.
authorMichael Mann <mmann78@netscape.net>
Thu, 17 Dec 2015 04:15:03 +0000 (23:15 -0500)
committerMichael Mann <mmann78@netscape.net>
Sat, 19 Dec 2015 14:22:56 +0000 (14:22 +0000)
commit444dfda793784cecda0757cbe50e27a5ba855ba0
treeec34e5780c2dbe29bc2f170c2fc406ee20aa0430
parent7baac67149a68b66087c5d688dbeda2869485765
Allow "capture info data" to not be a singleton.

It was buried as a static variable in capture_info.c, and functions were refactored to allow a pointer to the info_data_t structure to be passed in. TShark and GTK will have their own single (global) copy of the structure, while it opens up Qt to have multiple instances.

Change-Id: Ic2d7a2ad574de43f457cb18b194d6bc3fffb6120
Reviewed-on: https://code.wireshark.org/review/12691
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
15 files changed:
capchild/capture_session.h
capchild/capture_sync.c
capchild/capture_sync.h
capture_info.c
capture_info.h
tshark.c
ui/capture.c
ui/capture.h
ui/capture_globals.h
ui/gtk/capture_dlg.c
ui/gtk/gtkglobals.h
ui/gtk/main.c
ui/qt/main_window.h
ui/qt/main_window_slots.cpp
wireshark-qt.cpp