diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-24 10:44:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-26 20:55:25 +0000 |
| commit | b68fb9b659b0debd7286195f9ad194be998cc3ff (patch) | |
| tree | 6567357b78b917f85d50fe1842f864b0dc904e99 /epan/dissectors/packet-tpncp.c | |
| parent | 4cf6583b9e5bc7fa5d6f6ac17cdc1f634ae1567e (diff) | |
Fix some dissectors doing termio (fprintf(stderr,..), g_warning()).
- Use report_...failure() (in most cases).
- Also: Do some misc fixes in certain disectors
- re-arrange order of #includes
- Fixup preferences help text
Change-Id: I385f6f97257f365f53ce611df02f57f9257dc5f9
Reviewed-on: https://code.wireshark.org/review/6039
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tpncp.c')
| -rw-r--r-- | epan/dissectors/packet-tpncp.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 0b1a43319a..ce4018cf3a 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -35,6 +35,7 @@ #include <epan/to_str.h> #include <wsutil/filesystem.h> #include <wsutil/file_util.h> +#include <wsutil/report_err.h> #include "packet-tcp.h" /*-------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -805,7 +806,7 @@ void proto_register_tpncp(void) { "TPNCP", "tpncp"); if(global_tpncp_load_db){ if (init_tpncp_db() == -1) { - g_warning("Could not load tpncp.dat file, tpncp dissector will not work"); + report_failure("tpncp: Could not load tpncp.dat file, tpncp dissector will not work"); return; } @@ -826,7 +827,7 @@ void proto_register_tpncp(void) { } CATCH_ALL { - g_warning("Corrupt tpncp.dat file, tpncp dissector will not work."); + report_failure("Corrupt tpncp.dat file, tpncp dissector will not work."); } ENDTRY; @@ -840,11 +841,11 @@ void proto_register_tpncp(void) { /* See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9569 for some discussion on this as well */ prefs_register_bool_preference(tpncp_module, "load_db", - "Whether to load DB or not, if DB not loaded dissector is passive", - "Whether to load the Data base or not, not loading the DB " - "dissaables the protocol, Wireshar has to be restarted for the" - "setting to take effect ", - &global_tpncp_load_db); + "Whether to load DB or not; if DB not loaded dissector is passive", + "Whether to load the Database or not; not loading the DB" + " disables the protocol; Wireshark has to be restarted for the" + " setting to take effect.", + &global_tpncp_load_db); prefs_register_uint_preference(tpncp_module, "tcp.trunkpack_port", "TPNCP \"well-known\" TrunkPack TCP Port", |