Add support for "API groups" in checkAPIs.pl. Make the "prohibited"

and "deprecated" groups the default. Add an "abort" group for code that
shouldn't exit the program. Update the makefiles to call "checkAPIs.pl
-g abort" for dissectors. Remove a dependency on "cat" in checkAPIs.pl.

svn path=/trunk/; revision=25614

30 files changed, 30 insertions, 30 deletions

diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 2902af11b1..dfd5812d29 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 $(DISSECTOR_SRC)
+#	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index 2c1adb4774..b6b9978e9b 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake
index 582b54ca57..0b09e71e51 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 16ef412e52..0c7cd6b514 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 \
+	$(PERL) ../../tools/checkAPIs.pl -g abort \
 	packet-cosnaming.c \
 	packet-coseventcomm.c \
 	packet-tango.c \
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/infiniband/Makefile.nmake b/plugins/infiniband/Makefile.nmake
index f0f5d2dfa2..590652a023 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index ad2bb88f5b..3c6db870c5 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index ef8aee90d4..906b718202 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/sbus/Makefile.nmake b/plugins/sbus/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index 8c8501c5c7..e3cc88ecf9 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 $(TAP_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(TAP_SRC)
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index a8dbd785ff..1369afce13 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake
index f4387832d2..dcf18805e8 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)
diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index 5d0a5e124b..29649a676f 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 \
+	$(PERL) ../../tools/checkAPIs.pl -g abort \
 	$(DISSECTOR_SRC) \
 	$(DISSECTOR_SUPPORT_SRC)
diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 2ed14f00c1..83ce3cf539 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 $(DISSECTOR_SRC)
+	$(PERL) ../../tools/checkAPIs.pl -g abort $(DISSECTOR_SRC)