diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-11 21:56:14 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-12 04:56:49 +0000 |
| commit | 4d2d42310610e736f23466472ca5dd70b7655c7f (patch) | |
| tree | 2e87b1698892166172d6b5410e2c306d3298b2c8 /tshark.c | |
| parent | c0792555392f234ab96917e784d365b5de053836 (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 'tshark.c')
| -rw-r--r-- | tshark.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2805,10 +2805,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); @@ -2880,7 +2880,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, frame_data *fd /* If we're running a display filter, prime the epan_dissect_t with that filter. */ if (cf->dfcode) - epan_dissect_prime_dfilter(edt, cf->dfcode); + epan_dissect_prime_with_dfilter(edt, cf->dfcode); col_custom_prime_edt(edt, &cf->cinfo); @@ -3555,7 +3555,7 @@ process_packet(capture_file *cf, epan_dissect_t *edt, gint64 offset, struct wtap /* If we're running a filter, prime the epan_dissect_t with that filter. */ if (cf->dfcode) - epan_dissect_prime_dfilter(edt, cf->dfcode); + epan_dissect_prime_with_dfilter(edt, cf->dfcode); col_custom_prime_edt(edt, &cf->cinfo); |