diff options
author | Gerald Combs <gerald@wireshark.org> | 2017-12-01 11:13:18 -0800 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-12-01 21:09:24 +0000 |
commit | 28b6616ea0d39cc699e4db9bccbb7948a55c7239 (patch) | |
tree | 34ae0358ecc0349f0e76ab741fd436115612614c /tfshark.c | |
parent | 219c5463d121a2ed51820fdda60a48e3fa27c6ca (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 'tfshark.c')
-rw-r--r-- | tfshark.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1026,10 +1026,8 @@ clean_exit: } static const nstime_t * -tfshark_get_frame_ts(void *data, guint32 frame_num) +tfshark_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; @@ -1049,7 +1047,7 @@ tfshark_get_frame_ts(void *data, guint32 frame_num) } static const char * -no_interface_name(void *data _U_, guint32 interface_id _U_) +no_interface_name(struct _capture_file *cf _U_, guint32 interface_id _U_) { return ""; } @@ -1059,7 +1057,7 @@ tfshark_epan_new(capture_file *cf) { epan_t *epan = epan_new(); - epan->data = cf; + epan->cf = cf; epan->get_frame_ts = tfshark_get_frame_ts; epan->get_interface_name = no_interface_name; epan->get_user_comment = NULL; |