aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-11 21:56:14 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-12 04:56:49 +0000
commit4d2d42310610e736f23466472ca5dd70b7655c7f (patch)
tree2e87b1698892166172d6b5410e2c306d3298b2c8 /file.c
parentc0792555392f234ab96917e784d365b5de053836 (diff)
Rename routines to clarify what they do.
XXX_prime_with_YYY makes it a bit clearer than does XXX_prime_YYY that we're not priming YYY, we're priming XXX *using* YYY. Change-Id: I1686b8b5469bc0f0bd6db8551fb6301776a1b133 Reviewed-on: https://code.wireshark.org/review/21031 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
-rw-r--r--file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/file.c b/file.c
index 4f3908009f..865b7703b0 100644
--- a/file.c
+++ b/file.c
@@ -1151,7 +1151,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
cf->prev_cap = fdata;
if (dfcode != NULL) {
- epan_dissect_prime_dfilter(edt, dfcode);
+ epan_dissect_prime_with_dfilter(edt, dfcode);
}
#if 0
/* Prepare coloring rules, this ensures that display filter rules containing
@@ -1238,7 +1238,7 @@ read_packet(capture_file *cf, dfilter_t *dfcode, epan_dissect_t *edt,
epan_dissect_t rf_edt;
epan_dissect_init(&rf_edt, cf->epan, TRUE, FALSE);
- epan_dissect_prime_dfilter(&rf_edt, cf->rfcode);
+ epan_dissect_prime_with_dfilter(&rf_edt, cf->rfcode);
epan_dissect_run(&rf_edt, cf->cd_t, phdr, frame_tvbuff_new(&fdlocal, buf), &fdlocal, NULL);
passed = dfilter_apply_edt(cf->rfcode, &rf_edt);
epan_dissect_cleanup(&rf_edt);
@@ -3439,7 +3439,7 @@ match_dfilter(capture_file *cf, frame_data *fdata, void *criterion)
}
epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
- epan_dissect_prime_dfilter(&edt, sfcode);
+ epan_dissect_prime_with_dfilter(&edt, sfcode);
epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
result = dfilter_apply_edt(sfcode, &edt) ? MR_MATCHED : MR_NOTMATCHED;
epan_dissect_cleanup(&edt);