diff options
40 files changed, 46 insertions, 42 deletions
diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake index a255a3f6f8..093eb03ae2 100644 --- a/codecs/Makefile.nmake +++ b/codecs/Makefile.nmake @@ -35,6 +35,6 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../tools/checkAPIs.pl \ + $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ G711a/G711adecode.c \ G711u/G711udecode.c diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 0dc7c3b7e4..5287dcc37d 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -310,4 +310,4 @@ dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon $(LEMON)\lemon t=$(LEMON)\lempar.c dtd_grammar.lemon checkapi: - $(PERL) ../tools/checkAPIs.pl $(LIBWIRESHARK_SRC) \
\ No newline at end of file + $(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC) \ diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake index 2791340bc7..b05773a2cf 100644 --- a/epan/crypt/Makefile.nmake +++ b/epan/crypt/Makefile.nmake @@ -26,5 +26,5 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ $(LIBAIRPDCAP_SRC) diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index e1942ea3ad..c0b28c83af 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/Makefile.nmake @@ -77,7 +77,7 @@ $(LEMON)\lemon.exe: cd ../../epan/dfilter checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ scanner.l \ grammar.lemon \ dfilter.c \ diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 78c5174925..9d8b06a008 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -111,6 +111,6 @@ maintainer-clean: distclean rm -f $(GENERATED_FILES) checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ $(ALL_DISSECTORS_SRC) \ packet-dcerpc-nt.c diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake index 848159e795..5cd5571b6f 100644 --- a/epan/ftypes/Makefile.nmake +++ b/epan/ftypes/Makefile.nmake @@ -41,7 +41,7 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ ftypes.c \ ftype-bytes.c \ ftype-double.c \ diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake index d0aeb794d3..1631937f90 100644 --- a/epan/wslua/Makefile.nmake +++ b/epan/wslua/Makefile.nmake @@ -82,7 +82,7 @@ init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wt $(PERL) make-init-lua.pl "." template-init.lua > init.lua checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ $(MODULES) \ init_wslua.c \ register_wslua.c \ diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/agentx/Makefile.nmake +++ b/plugins/agentx/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/artnet/Makefile.nmake +++ b/plugins/artnet/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index dfd5812d29..6bdc36773d 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -101,4 +101,4 @@ maintainer-clean: distclean checkapi: # TODO: Fix api's :) -# $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) +# $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/ciscosm/Makefile.nmake +++ b/plugins/ciscosm/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake index b6b9978e9b..3d04e32b34 100644 --- a/plugins/easy_codec/Makefile.nmake +++ b/plugins/easy_codec/Makefile.nmake @@ -64,4 +64,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/enttec/Makefile.nmake +++ b/plugins/enttec/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake index 0b09e71e51..810e87397e 100644 --- a/plugins/ethercat/Makefile.nmake +++ b/plugins/ethercat/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index 0c7cd6b514..11cd17094f 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -51,7 +51,7 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ packet-cosnaming.c \ packet-coseventcomm.c \ packet-tango.c \ diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/infiniband/Makefile.nmake b/plugins/infiniband/Makefile.nmake index 590652a023..40f8f82f7f 100644 --- a/plugins/infiniband/Makefile.nmake +++ b/plugins/infiniband/Makefile.nmake @@ -96,4 +96,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/lwres/Makefile.nmake +++ b/plugins/lwres/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake index 3c6db870c5..ee662b26ab 100644 --- a/plugins/m2m/Makefile.nmake +++ b/plugins/m2m/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index 906b718202..fdce120155 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -128,4 +128,4 @@ $(LEMON)\lemon.exe: cd ../../plugins/mate checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/opcua/Makefile.nmake +++ b/plugins/opcua/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/opsi/Makefile.nmake +++ b/plugins/opsi/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/pcli/Makefile.nmake +++ b/plugins/pcli/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/profinet/Makefile.nmake +++ b/plugins/profinet/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/rlm/Makefile.nmake +++ b/plugins/rlm/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/rtnet/Makefile.nmake +++ b/plugins/rtnet/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/rudp/Makefile.nmake +++ b/plugins/rudp/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/sbus/Makefile.nmake b/plugins/sbus/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/sbus/Makefile.nmake +++ b/plugins/sbus/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/sercosiii/Makefile.nmake +++ b/plugins/sercosiii/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake index e3cc88ecf9..89fc5c9376 100644 --- a/plugins/stats_tree/Makefile.nmake +++ b/plugins/stats_tree/Makefile.nmake @@ -54,4 +54,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(TAP_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(TAP_SRC) diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake index 1369afce13..d9112f14e3 100644 --- a/plugins/tpg/Makefile.nmake +++ b/plugins/tpg/Makefile.nmake @@ -65,4 +65,4 @@ $(LEMON)\lemon.exe: cd ../../plugins/mate checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/unistim/Makefile.nmake +++ b/plugins/unistim/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake index dcf18805e8..3cf4dc5b3e 100644 --- a/plugins/v5ua/Makefile.nmake +++ b/plugins/v5ua/Makefile.nmake @@ -100,4 +100,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake index 29649a676f..37220cbb5c 100644 --- a/plugins/wimax/Makefile.nmake +++ b/plugins/wimax/Makefile.nmake @@ -100,6 +100,6 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ $(DISSECTOR_SRC) \ $(DISSECTOR_SUPPORT_SRC) diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake index 83ce3cf539..dc3f07e5f6 100644 --- a/plugins/wimaxasncp/Makefile.nmake +++ b/plugins/wimaxasncp/Makefile.nmake @@ -108,4 +108,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index d6d90d1713..61ecef3166 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -131,9 +131,8 @@ my %APIs = ( 'g_scanner_foreach_symbol', 'g_scanner_freeze_symbol_table', 'g_scanner_thaw_symbol_table', - # Wireshark should not write to stdout (?) - # (Of course tshark should!) - 'printf', + # Use strerror() and report messages in whatever + # fashion is appropriate for the code in question. 'perror', # Use PROTO_ITEM_SET_HIDDEN instead of these: 'proto_tree_add_item_hidden', @@ -161,6 +160,11 @@ my %APIs = ( 'g_error', ]}, + # APIs that print to the terminal. Dissectors shouldn't call these + 'termoutput' => { 'count_errors' => 0, 'functions' => [ + 'printf', + ]}, + ); diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 8cd54cfa85..5bbb3595c9 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -74,4 +74,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort $(NONGENERATED_C_FILES) $(GENERATOR_FILES) + $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES) diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 3a304c5244..743f86ad29 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -53,6 +53,6 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort \ + $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ $(LIBWSUTIL_SRC) \ # file_util.c |