diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-07-25 22:58:09 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-07-26 04:08:50 +0000 |
| commit | 907d49483d24698013fcdaec15b78a149751eecb (patch) | |
| tree | 001c978c947dd64932fd2d9749cfc46756ac30dc /epan/disabled_protos.c | |
| parent | 6fbaf9be34e8745b2781294afdcf2822528a6349 (diff) | |
Fix some of the checkAPIs.pl warnings for g_warning.
1. Create ws_g_warning for legitimate uses of g_warning
2. Use proto_tree_add_debug_text
3. Comment some out
Change-Id: Ida044bf40286b955fdd529c4f9907c8e09b3d7c5
Reviewed-on: https://code.wireshark.org/review/16678
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/disabled_protos.c')
| -rw-r--r-- | epan/disabled_protos.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/disabled_protos.c b/epan/disabled_protos.c index c0492602a9..38aef4c1c7 100644 --- a/epan/disabled_protos.c +++ b/epan/disabled_protos.c @@ -34,6 +34,7 @@ #include "disabled_protos.h" #include <wsutil/file_util.h> +#include <wsutil/ws_printf.h> /* ws_g_warning */ #define PROTOCOLS_FILE_NAME "disabled_protos" #define HEURISTICS_FILE_NAME "heuristic_protos" @@ -256,7 +257,7 @@ read_disabled_protos_list_file(const char *ff_path, FILE *ff, if (c != EOF && c != '\n' && c != '#') { /* Non-white-space after the protocol name; warn about it, in case we come up with a reason to use it. */ - g_warning("'%s' line %d has extra stuff after the protocol name.", + ws_g_warning("'%s' line %d has extra stuff after the protocol name.", ff_path, line); } } @@ -271,7 +272,7 @@ read_disabled_protos_list_file(const char *ff_path, FILE *ff, goto error; /* I/O error */ else { /* EOF, not error; no newline seen before EOF */ - g_warning("'%s' line %d doesn't have a newline.", ff_path, + ws_g_warning("'%s' line %d doesn't have a newline.", ff_path, line); } break; /* nothing more to read */ @@ -581,7 +582,7 @@ read_disabled_heur_dissector_list_file(const char *ff_path, FILE *ff, if (c != EOF && c != '\n' && c != '#') { /* Non-white-space after the protocol name; warn about it, in case we come up with a reason to use it. */ - g_warning("'%s' line %d has extra stuff after the protocol name.", + ws_g_warning("'%s' line %d has extra stuff after the protocol name.", ff_path, line); } } @@ -596,7 +597,7 @@ read_disabled_heur_dissector_list_file(const char *ff_path, FILE *ff, goto error; /* I/O error */ else { /* EOF, not error; no newline seen before EOF */ - g_warning("'%s' line %d doesn't have a newline.", ff_path, + ws_g_warning("'%s' line %d doesn't have a newline.", ff_path, line); } break; /* nothing more to read */ |