aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-12-01 11:13:18 -0800
committerAnders Broman <a.broman58@gmail.com>2017-12-01 21:09:24 +0000
commit28b6616ea0d39cc699e4db9bccbb7948a55c7239 (patch)
tree34ae0358ecc0349f0e76ab741fd436115612614c /sharkd.c
parent219c5463d121a2ed51820fdda60a48e3fa27c6ca (diff)
Get rid of some void pointers.
Explictly struct _capture_file * in epan_session and its callbacks. Change-Id: I63703015c661a08f3350a7448a7bcdaf98f119dc Reviewed-on: https://code.wireshark.org/review/24675 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'sharkd.c')
-rw-r--r--sharkd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sharkd.c b/sharkd.c
index c24e3f3ecc..e7cfc3bd58 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -224,10 +224,8 @@ clean_exit:
}
static const nstime_t *
-sharkd_get_frame_ts(void *data, guint32 frame_num)
+sharkd_get_frame_ts(struct _capture_file *cf, guint32 frame_num)
{
- capture_file *cf = (capture_file *) data;
-
if (ref && ref->num == frame_num)
return &ref->abs_ts;
@@ -251,7 +249,7 @@ sharkd_epan_new(capture_file *cf)
{
epan_t *epan = epan_new();
- epan->data = cf;
+ epan->cf = cf;
epan->get_frame_ts = sharkd_get_frame_ts;
epan->get_interface_name = cap_file_get_interface_name;
epan->get_interface_description = cap_file_get_interface_description;