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 /ui | |
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 'ui')
-rw-r--r-- | ui/gtk/iax2_analysis.c | 2 | ||||
-rw-r--r-- | ui/gtk/packet_win.c | 2 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c | 4 | ||||
-rw-r--r-- | ui/gtk/sctp_assoc_analyse.c | 2 | ||||
-rw-r--r-- | ui/qt/iax2_analysis_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/rtp_analysis_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/tap-rlc-graph.c | 2 | ||||
-rw-r--r-- | ui/tap-tcp-stream.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 19b8e633b6..a4d3b5b8a4 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -3566,7 +3566,7 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_) if (!cf_read_record(cf, fdata)) return; /* error reading the record */ 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); diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 7459019653..635f305bb5 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -262,7 +262,7 @@ finfo_window_refresh(struct FieldinfoWinData *DataPtr) epan_dissect_init(&edt, cfile.epan, TRUE, TRUE); /* Makes any sense? if (old_finfo->hfinfo) - proto_tree_prime_hfid(edt.tree, old_finfo->hfinfo->id); + proto_tree_prime_with_hfid(edt.tree, old_finfo->hfinfo->id); */ epan_dissect_run(&edt, cfile.cd_t, &DataPtr->phdr, frame_tvbuff_new(DataPtr->frame, DataPtr->pd), DataPtr->frame, NULL); diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 3decd2e41f..a3f3435631 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -3897,8 +3897,8 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_) if (!cf_read_record(cf, fdata)) return; /* error reading the record */ epan_dissect_init(&edt, cf->epan, TRUE, FALSE); - epan_dissect_prime_dfilter(&edt, sfcode); - epan_dissect_prime_hfid(&edt, hfid_rtp_ssrc); + epan_dissect_prime_with_dfilter(&edt, sfcode); + epan_dissect_prime_with_hfid(&edt, hfid_rtp_ssrc); epan_dissect_run(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL); /* diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 23fb5159e1..b942cf3b72 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -1000,7 +1000,7 @@ sctp_analyse_cb(struct sctp_analyse *u_data, gboolean ext) return; /* error reading the record */ 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); /* if it is not an sctp packet, show the dialog */ diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index c15ae044f4..ee4e5fdfe0 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -333,7 +333,7 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : epan_dissect_t edt; epan_dissect_init(&edt, cap_file_.capFile()->epan, TRUE, FALSE); - epan_dissect_prime_dfilter(&edt, sfcode); + epan_dissect_prime_with_dfilter(&edt, sfcode); epan_dissect_run(&edt, cap_file_.capFile()->cd_t, &cap_file_.capFile()->phdr, frame_tvbuff_new_buffer(fdata, &cap_file_.capFile()->buf), fdata, NULL); diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index e30b9dd44c..5d82e46772 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -1604,8 +1604,8 @@ void RtpAnalysisDialog::findStreams() epan_dissect_t edt; epan_dissect_init(&edt, cap_file_.capFile()->epan, TRUE, FALSE); - epan_dissect_prime_dfilter(&edt, sfcode); - epan_dissect_prime_hfid(&edt, hfid_rtp_ssrc); + epan_dissect_prime_with_dfilter(&edt, sfcode); + epan_dissect_prime_with_hfid(&edt, hfid_rtp_ssrc); epan_dissect_run(&edt, cap_file_.capFile()->cd_t, &cap_file_.capFile()->phdr, frame_tvbuff_new_buffer(fdata, &cap_file_.capFile()->buf), fdata, NULL); diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index e5bb6cfeb5..5ff9676e9d 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -145,7 +145,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf, } epan_dissect_init(&edt, cf->epan, TRUE, FALSE); - epan_dissect_prime_dfilter(&edt, sfcode); + epan_dissect_prime_with_dfilter(&edt, sfcode); epan_dissect_run_with_taps(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL); rel_ts = edt.pi.rel_ts; epan_dissect_cleanup(&edt); diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 44115aa99f..69b7a87ee7 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -318,7 +318,7 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs) } epan_dissect_init(&edt, cf->epan, TRUE, FALSE); - epan_dissect_prime_dfilter(&edt, sfcode); + epan_dissect_prime_with_dfilter(&edt, sfcode); epan_dissect_run_with_taps(&edt, cf->cd_t, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL); rel_ts = edt.pi.rel_ts; epan_dissect_cleanup(&edt); |