aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd.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 /sharkd.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 'sharkd.c')
-rw-r--r--sharkd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sharkd.c b/sharkd.c
index 666e46a652..ffd9019bdb 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -302,10 +302,10 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt,
/* If we're running a read filter, prime the epan_dissect_t with that
filter. */
if (cf->rfcode)
- epan_dissect_prime_dfilter(edt, cf->rfcode);
+ epan_dissect_prime_with_dfilter(edt, cf->rfcode);
if (cf->dfcode)
- epan_dissect_prime_dfilter(edt, cf->dfcode);
+ epan_dissect_prime_with_dfilter(edt, cf->dfcode);
frame_data_set_before_dissect(&fdlocal, &cf->elapsed_time,
&ref, prev_dis);
@@ -907,7 +907,7 @@ sharkd_filter(const char *dftext, guint8 **result)
break;
/* frame_data_set_before_dissect */
- epan_dissect_prime_dfilter(&edt, dfcode);
+ epan_dissect_prime_with_dfilter(&edt, dfcode);
epan_dissect_run(&edt, cfile.cd_t, &phdr, frame_tvbuff_new_buffer(fdata, &buf), fdata, NULL);