diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-09-18 10:09:31 -0700 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2018-09-19 16:07:03 +0000 |
| commit | 8f08a4e74ea8aa56284e6035017adf1c423c4f09 (patch) | |
| tree | 030955437d3e8b2a2b5ebdcb3e0f9ba77ab42ef9 /epan/disabled_protos.c | |
| parent | ca8304249ee986f947b30eaea1d830207165c65e (diff) | |
Try to discourage the use of APIs via counting.
Add the ability to specify maximum function counts for each group to
checkAPIs. Add maximum counts for the "termoutput" and "abort" groups
where needed. Show summaries in various checkAPI targets.
Switch uses of ws_g_warning back to plain g_warning.
Change-Id: I5cbddc8c671729e424eed8551f69116d16491976
Reviewed-on: https://code.wireshark.org/review/29721
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/disabled_protos.c')
| -rw-r--r-- | epan/disabled_protos.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/disabled_protos.c b/epan/disabled_protos.c index 12979d3c37..8e4894689f 100644 --- a/epan/disabled_protos.c +++ b/epan/disabled_protos.c @@ -23,7 +23,6 @@ #include "disabled_protos.h" #include <wsutil/file_util.h> -#include <wsutil/ws_printf.h> /* ws_g_warning */ #include <wsutil/report_message.h> #define ENABLED_PROTOCOLS_FILE_NAME "enabled_protos" @@ -321,7 +320,7 @@ read_protos_list_file(const char *ff_path, FILE *ff, GList **flp) 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. */ - ws_g_warning("'%s' line %d has extra stuff after the protocol name.", + g_warning("'%s' line %d has extra stuff after the protocol name.", ff_path, line); } } @@ -336,7 +335,7 @@ read_protos_list_file(const char *ff_path, FILE *ff, GList **flp) goto error; /* I/O error */ else { /* EOF, not error; no newline seen before EOF */ - ws_g_warning("'%s' line %d doesn't have a newline.", ff_path, + g_warning("'%s' line %d doesn't have a newline.", ff_path, line); } break; /* nothing more to read */ @@ -642,7 +641,7 @@ read_heur_dissector_list_file(const char *ff_path, FILE *ff, GList **flp) 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. */ - ws_g_warning("'%s' line %d has extra stuff after the protocol name.", + g_warning("'%s' line %d has extra stuff after the protocol name.", ff_path, line); } } @@ -657,7 +656,7 @@ read_heur_dissector_list_file(const char *ff_path, FILE *ff, GList **flp) goto error; /* I/O error */ else { /* EOF, not error; no newline seen before EOF */ - ws_g_warning("'%s' line %d doesn't have a newline.", ff_path, + g_warning("'%s' line %d doesn't have a newline.", ff_path, line); } break; /* nothing more to read */ |