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 /capchild/capture_sync.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 'capchild/capture_sync.h')
| -rw-r--r-- | capchild/capture_sync.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/capchild/capture_sync.h b/capchild/capture_sync.h index 3cdac27956..2f4a512af0 100644 --- a/capchild/capture_sync.h +++ b/capchild/capture_sync.h @@ -36,6 +36,8 @@ extern "C" { #endif /* __cplusplus */ +struct _info_data; + /** * Start a new capture session. * Create a capture child which is doing the real capture work. @@ -50,7 +52,7 @@ extern "C" { * @return TRUE if a capture could be started, FALSE if not */ extern gboolean -sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, void(*update_cb)(void)); +sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, struct _info_data* cap_data, void(*update_cb)(void)); /** User wants to stop capturing, gracefully close the capture child */ extern void |