diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-16 23:15:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-19 14:22:56 +0000 |
| commit | 444dfda793784cecda0757cbe50e27a5ba855ba0 (patch) | |
| tree | ec34e5780c2dbe29bc2f170c2fc406ee20aa0430 /ui/capture.h | |
| parent | 7baac67149a68b66087c5d688dbeda2869485765 (diff) | |
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>
Diffstat (limited to 'ui/capture.h')
| -rw-r--r-- | ui/capture.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/capture.h b/ui/capture.h index 5057b82910..5da05ba949 100644 --- a/ui/capture.h +++ b/ui/capture.h @@ -30,6 +30,7 @@ */ #include "capture_opts.h" +#include "capture_info.h" #include "capchild/capture_session.h" #ifdef __cplusplus @@ -66,7 +67,7 @@ capture_callback_remove(capture_callback_t func, gpointer user_data); * @return TRUE if the capture starts successfully, FALSE otherwise. */ extern gboolean -capture_start(capture_options *capture_opts, capture_session *cap_session, void(*update_cb)(void)); +capture_start(capture_options *capture_opts, capture_session *cap_session, info_data_t* cap_data, void(*update_cb)(void)); /** Stop a capture session (usually from a menu item). */ extern void |