Fix some of the Errors/warnings detected by checkapi.

svn path=/trunk/; revision=25335

11 files changed, 64 insertions, 17 deletions

diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake
index 5a32997c60..6aa21c4986 100644
--- a/asn1/h225/Makefile.nmake
+++ b/asn1/h225/Makefile.nmake
@@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake
 include Makefile.common
 include ../Makefile.inc.nmake
 
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl \
+	$(PROTOCOL_NAME).cnf \
+	packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 0d997d35f2..17646e0ef7 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -382,6 +382,7 @@ static void reset_h225_packet_info(h225_packet_info *pi)
 
 static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, h225_packet_info *pi)
 {
+	proto_item *hidden_item;
 	conversation_t* conversation = NULL;
 	h225ras_call_info_key h225ras_call_key;
 	h225ras_call_t *h225ras_call = NULL;
@@ -443,7 +444,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
 							/* No, so it's a duplicate request.
 							   Mark it as such. */
 							pi->is_duplicate = TRUE;
-							proto_tree_add_uint_hidden(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum);
+							hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum);
+							PROTO_ITEM_SET_HIDDEN(hidden_item);
 						}
 						break;
 					}
@@ -493,7 +495,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
 					/* if this is an ACF, ARJ or DCF, DRJ, give guid to tap and make it filterable */
 					if (msg_category == 3 || msg_category == 5) {
 						pi->guid = h225ras_call->guid;
-						proto_tree_add_guid_hidden(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid);
+						hidden_item = proto_tree_add_guid(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid);
+						PROTO_ITEM_SET_HIDDEN(hidden_item);
 					}
 
 					if (h225ras_call->rsp_num == 0) {
@@ -509,7 +512,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
 							/* No, so it's a duplicate response.
 							   Mark it as such. */
 							pi->is_duplicate = TRUE;
-							proto_tree_add_uint_hidden(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum);
+							hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum);
+							PROTO_ITEM_SET_HIDDEN(hidden_item);
 						}
 					}
 
diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake
index 5a32997c60..6aa21c4986 100644
--- a/asn1/h235/Makefile.nmake
+++ b/asn1/h235/Makefile.nmake
@@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake
 include Makefile.common
 include ../Makefile.inc.nmake
 
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl \
+	$(PROTOCOL_NAME).cnf \
+	packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file
diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf
index 98644aa03f..74032a5448 100644
--- a/asn1/h235/h235.cnf
+++ b/asn1/h235/h235.cnf
@@ -53,21 +53,31 @@ NonStandardParameter/data  TYPE = FT_UINT32  DISPLAY = BASE_DEC
 #.END
 
 #.FN_HDR SIGNED
-  proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+  proto_item  *hidden_item;
+  hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
 #.END
 #.FN_HDR ENCRYPTED
-  proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+  proto_item  *hidden_item;
+  hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
 #.END
 #.FN_HDR HASHED
-  proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+  proto_item  *hidden_item;
+  hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
 #.END
 
 #.FN_HDR ClearToken
-  proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+  proto_item  *hidden_item;
+  hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
 #.END
 
 #.FN_HDR CryptoToken
-  proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+  proto_item  *hidden_item;
+  hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
 #.END
 
 
diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake
index 0e49c7e460..7a5709b5e0 100644
--- a/asn1/h450/Makefile.nmake
+++ b/asn1/h450/Makefile.nmake
@@ -1,6 +1,6 @@
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake 23131 2007-10-10 10:25:09Z kukosa $
+# $Id$
 #
 #
 # Wireshark - Network traffic analyzer
@@ -27,3 +27,8 @@ include ../Makefile.preinc.nmake
 include Makefile.common
 include ../Makefile.inc.nmake
 
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl \
+	$(PROTOCOL_NAME).cnf \
+	packet-$(PROTOCOL_NAME)-template.c
+
diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf
index b89dafa008..a28ee36767 100644
--- a/asn1/h450/h450.cnf
+++ b/asn1/h450/h450.cnf
@@ -40,7 +40,10 @@ OPERATION.&ResultType
 ERROR.&ParameterType
 
 #.FN_HDR H4501SupplementaryService
-  proto_tree_add_item_hidden(tree, proto_h450, tvb, offset, -1, FALSE);
+  proto_item *hidden_item;
+
+  hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
 #.END
 
 #.FN_HDR ServiceApdus/rosApdus/_item
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index c6d2ca76b2..2c8420dd95 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -120,6 +120,7 @@ static const h450_err_t *get_err(gint32 errcode) {
 /*--- dissect_h450_arg ------------------------------------------------------*/
 static int   
 dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+  proto_item *hidden_item;
   int offset;
   rose_ctx_t *rctx;
   gint32 opcode;
@@ -138,7 +139,8 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   if (!op_ptr)
     return offset; 
 
-  proto_tree_add_uint_hidden(tree, hf_h450_operation, tvb, 0, 0, opcode);
+  hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   p = match_strval(opcode, VALS(h450_str_operation));
   if (p) {
     proto_item_append_text(rctx->d.code_item, " - %s", p);
@@ -160,6 +162,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 /*--- dissect_h450_res ------------------------------------------------------*/
 static int   
 dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+  proto_item *hidden_item;
   int offset;
   rose_ctx_t *rctx;
   gint32 opcode;
@@ -178,7 +181,8 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   if (!op_ptr)
     return offset; 
 
-  proto_tree_add_uint_hidden(tree, hf_h450_operation, tvb, 0, 0, opcode);
+  hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   p = match_strval(opcode, VALS(h450_str_operation));
   if (p) {
     proto_item_append_text(rctx->d.code_item, " - %s", p);
@@ -200,6 +204,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 /*--- dissect_h450_err ------------------------------------------------------*/
 static int   
 dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+  proto_item *hidden_item;
   int offset;
   rose_ctx_t *rctx;
   gint32 errcode;
@@ -218,7 +223,8 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   if (!err_ptr)
     return offset; 
 
-  proto_tree_add_uint_hidden(tree, hf_h450_error, tvb, 0, 0, errcode);
+  hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   p = match_strval(errcode, VALS(h450_str_error));
   if (p) {
     proto_item_append_text(rctx->d.code_item, " - %s", p);
diff --git a/asn1/q932/Makefile.nmake b/asn1/q932/Makefile.nmake
index 5a32997c60..6aa21c4986 100644
--- a/asn1/q932/Makefile.nmake
+++ b/asn1/q932/Makefile.nmake
@@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake
 include Makefile.common
 include ../Makefile.inc.nmake
 
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl \
+	$(PROTOCOL_NAME).cnf \
+	packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file
diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 597bc24823..d821c31a4b 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -241,7 +241,8 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   offset = 0;
 
-  ti = proto_tree_add_item_hidden(tree, proto_q932, tvb, offset, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, FALSE);
+  PROTO_ITEM_SET_HIDDEN(ti);
 
   ie_type = tvb_get_guint8(tvb, offset);
   ie_len = tvb_get_guint8(tvb, offset + 1);
diff --git a/asn1/qsig/Makefile.nmake b/asn1/qsig/Makefile.nmake
index 5a32997c60..6aa21c4986 100644
--- a/asn1/qsig/Makefile.nmake
+++ b/asn1/qsig/Makefile.nmake
@@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake
 include Makefile.common
 include ../Makefile.inc.nmake
 
+checkapi:
+	$(PERL) ../../tools/checkAPIs.pl \
+	$(PROTOCOL_NAME).cnf \
+	packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index d0b4c3c986..f65aa3a7ed 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -536,13 +536,14 @@ dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo  _U
 static void
 dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset) {
   gint offset;
-  proto_item *ti, *ti_ie;
+  proto_item *ti, *ti_ie, *hidden_item;
   proto_tree *ie_tree;
   guint8 ie_type, ie_len;
 
   offset = 0;
 
-  ti = proto_tree_add_item_hidden(tree, proto_qsig, tvb, offset, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, FALSE);
+  PROTO_ITEM_SET_HIDDEN(ti);
 
   ie_type = tvb_get_guint8(tvb, offset);
   ie_len = tvb_get_guint8(tvb, offset + 1);
@@ -551,7 +552,8 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset
             val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)"));
   ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie); 
   proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE);
-  proto_tree_add_item_hidden(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE);
+  hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE);
+  PROTO_ITEM_SET_HIDDEN(hidden_item);
   proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, FALSE);
   offset += 2;
   if (tvb_length_remaining(tvb, offset) <= 0)