From 407a2b07e55a262905881c7d1e225d618e9824fb Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 16 Apr 2017 18:48:30 -0700 Subject: Rename some routines and structure members. They deal with sets of hfids, which can belong to protocols as well as fields (I guess you could argue that a protocol is a field, but...). Change-Id: Ibd103cfa26427ead4ef54be89f1251908004cfae Reviewed-on: https://code.wireshark.org/review/21154 Reviewed-by: Guy Harris --- file.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index d0b8ff2fb4..eccc093593 100644 --- a/file.c +++ b/file.c @@ -572,11 +572,12 @@ cf_read(capture_file *cf, gboolean reloading) * * one of the tap listeners requires a protocol tree; * - * a postdissector wants field values on the first pass. + * a postdissector wants field values or protocols on + * the first pass. */ create_proto_tree = (dfcode != NULL || have_filtering_tap_listeners() || - (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_fields()); + (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_hfids()); reset_tap_listeners(); @@ -812,11 +813,12 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err) * * one of the tap listeners requires a protocol tree; * - * a postdissector wants field values on the first pass. + * a postdissector wants field values or protocols on + * the first pass. */ create_proto_tree = (dfcode != NULL || have_filtering_tap_listeners() || - (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_fields()); + (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_hfids()); *err = 0; @@ -957,11 +959,12 @@ cf_finish_tail(capture_file *cf, int *err) * * one of the tap listeners requires a protocol tree; * - * a postdissector wants field values on the first pass. + * a postdissector wants field values or protocols on + * the first pass. */ create_proto_tree = (dfcode != NULL || have_filtering_tap_listeners() || - (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_fields()); + (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_hfids()); if (cf->wth == NULL) { cf_close(cf); @@ -1165,8 +1168,8 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf, if (fdata->flags.visited) { /* This is the first pass, so prime the epan_dissect_t with the - fields postdissectors want on the first pass. */ - prime_epan_dissect_with_postdissector_wanted_fields(edt); + hfids postdissectors want on the first pass. */ + prime_epan_dissect_with_postdissector_wanted_hfids(edt); } /* Dissect the frame. */ @@ -1640,12 +1643,12 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb * one of the tap listeners requires a protocol tree; * * we're redissecting and a postdissector wants field - * values on the first pass. + * values or protocols on the first pass. */ create_proto_tree = (dfcode != NULL || have_filtering_tap_listeners() || (tap_flags & TL_REQUIRES_PROTO_TREE) || - (redissect && postdissectors_want_fields())); + (redissect && postdissectors_want_hfids())); reset_tap_listeners(); /* Which frame, if any, is the currently selected frame? -- cgit v1.2.1