Fix some of the Errors/warnings detected by checkapi.

svn path=/trunk/; revision=25307

9 files changed, 66 insertions, 36 deletions

diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 38775cc962..632a29d49f 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -2107,6 +2107,7 @@ v9_template_get(guint16 id, address * net_src, guint32 src_id)
 static int
 dissect_pdu(proto_tree * pdutree, tvbuff_t * tvb, int offset, hdrinfo_t * hdrinfo)
 {
+	proto_item     *hidden_item;
 	int             startoffset = offset;
 	guint32         srcaddr, dstaddr;
 	guint8          mask;
@@ -2187,16 +2188,18 @@ dissect_pdu(proto_tree * pdutree, tvbuff_t * tvb, int offset, hdrinfo_t * hdrinf
 				    "SrcMask: %u (prefix: %s/%u)",
 				    mask, getprefix(&srcaddr, mask),
 				    mask != 0 ? mask : 32);
-		proto_tree_add_uint_hidden(pdutree, hf_cflow_srcmask, tvb,
+		hidden_item = proto_tree_add_uint(pdutree, hf_cflow_srcmask, tvb,
 					   offset++, 1, mask);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 		mask = tvb_get_guint8(tvb, offset);
 		proto_tree_add_text(pdutree, tvb, offset, 1,
 				    "DstMask: %u (prefix: %s/%u)",
 				    mask, getprefix(&dstaddr, mask),
 				    mask != 0 ? mask : 32);
-		proto_tree_add_uint_hidden(pdutree, hf_cflow_dstmask, tvb,
+		hidden_item = proto_tree_add_uint(pdutree, hf_cflow_dstmask, tvb,
 					   offset++, 1, mask);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 		offset =
 		    flow_process_textfield(pdutree, tvb, offset, 2, "padding");
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 16e990f949..5396e6a45e 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -989,9 +989,10 @@ nfs_name_snoop_fh(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int fh_of
 		proto_item *fh_item;
 
 		if(hidden){
-			fh_item=proto_tree_add_string_hidden(tree, hf_nfs_name, tvb,
+			fh_item=proto_tree_add_string(tree, hf_nfs_name, tvb,
 				fh_offset, 0, nns->name);
-		}else {
+			PROTO_ITEM_SET_HIDDEN(fh_item);
+		} else {
 			fh_item=proto_tree_add_string_format(tree, hf_nfs_name, tvb,
 				fh_offset, 0, nns->name, "Name: %s", nns->name);
 		}
@@ -999,8 +1000,9 @@ nfs_name_snoop_fh(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int fh_of
 
 		if(nns->full_name){
 			if(hidden){
-				fh_item=proto_tree_add_string_hidden(tree, hf_nfs_full_name, tvb,
+				fh_item=proto_tree_add_string(tree, hf_nfs_full_name, tvb,
 					fh_offset, 0, nns->name);
+				PROTO_ITEM_SET_HIDDEN(fh_item);
 			} else {
 				fh_item=proto_tree_add_string_format(tree, hf_nfs_full_name, tvb,
 					fh_offset, 0, nns->name, "Full Name: %s", nns->full_name);
@@ -1928,8 +1930,9 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
 			fhhash ^= (val >> 16) ^ val;
 		}
 		if(hidden){
-			fh_item=proto_tree_add_uint_hidden(tree, hf_nfs_fh_hash, tvb, offset,
+			fh_item=proto_tree_add_uint(tree, hf_nfs_fh_hash, tvb, offset,
 				fhlen, fhhash);
+			PROTO_ITEM_SET_HIDDEN(fh_item);
 		} else {
 			fh_item=proto_tree_add_uint(tree, hf_nfs_fh_hash, tvb, offset,
 				fhlen, fhhash);
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 983f75cf3e..0a7491493c 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -990,7 +990,7 @@ static void
 dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     proto_tree *ospf_tree = NULL;
-    proto_item *ti;
+    proto_item *ti, *hidden_item;
     proto_tree *ospf_header_tree;
     guint8  version;
     guint8  packet_type;
@@ -1047,9 +1047,10 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			    version);
 	proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_MSG_TYPE],
 			    tvb, 1, 1, FALSE);
-	proto_tree_add_item_hidden(ospf_header_tree,
+	hidden_item = proto_tree_add_item(ospf_header_tree,
 				   ospf_filter[ospf_msg_type_to_filter(packet_type)],
 				   tvb, 1, 1, FALSE);
+	PROTO_ITEM_SET_HIDDEN(hidden_item);
  	proto_tree_add_text(ospf_header_tree, tvb, 2, 2, "Packet Length: %u",
 			    ospflen);
 	proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_SRC_ROUTER],
@@ -1616,7 +1617,7 @@ static void
 dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
 		      guint32 length)
 {
-    proto_item *ti;
+    proto_item *ti, *hidden_item;
     proto_tree *mpls_tree;
     proto_tree *tlv_tree;
     proto_tree *stlv_tree;
@@ -1637,8 +1638,9 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
     
     ti = proto_tree_add_text(tree, tvb, offset, length,
 			     "MPLS Traffic Engineering LSA");
-    proto_tree_add_item_hidden(tree, ospf_filter[OSPFF_LS_MPLS],
+    hidden_item = proto_tree_add_item(tree, ospf_filter[OSPFF_LS_MPLS],
 			       tvb, offset, 2, FALSE);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
     mpls_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls);
 
     while (length != 0) {
@@ -2211,7 +2213,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
 		 gboolean disassemble_body)
 {
     proto_tree *ospf_lsa_tree;
-    proto_item *ti;
+    proto_item *ti, *hidden_item;
 
     guint8		 ls_type;
     guint16		 ls_length;
@@ -2254,9 +2256,10 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
     dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset + 2, &bfinfo_v2_options);
     proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_LS_TYPE], tvb,
 			offset + 3, 1, FALSE);
-    proto_tree_add_item_hidden(ospf_lsa_tree,
+    hidden_item = proto_tree_add_item(ospf_lsa_tree,
 			       ospf_filter[ospf_ls_type_to_filter(ls_type)], tvb,
 			       offset + 3, 1, FALSE);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
 
     if (is_opaque(ls_type)) {
     	ls_id_type = tvb_get_guint8(tvb, offset + 4);
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 273bca4dc5..d9f92a5d36 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -257,7 +257,7 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre
 {
     int old_offset=offset;
     proto_tree *tree = NULL;
-    proto_item *item = NULL;
+    proto_item *item = NULL, *hidden_item;
     guint8 len, i;
 
     if (parent_tree) {
@@ -271,7 +271,8 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre
     if (len>0) {
       proto_item_append_text(tree, " (%d):", len);
     }
-    proto_tree_add_uint_hidden(tree, hf_pktc_list_of_ciphersuites_len, tvb, offset, 1, len);
+    hidden_item = proto_tree_add_uint(tree, hf_pktc_list_of_ciphersuites_len, tvb, offset, 1, len);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
     offset+=1;
 
     switch(doi){
@@ -582,7 +583,7 @@ dissect_pktc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint8 kmmid, doi, version;
     int offset=0;
     proto_tree *pktc_tree = NULL;
-    proto_item *item = NULL;
+    proto_item *item = NULL, *hidden_item;
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC");
@@ -605,8 +606,10 @@ dissect_pktc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     /* version */
     version=tvb_get_guint8(tvb, offset);
     proto_tree_add_text(pktc_tree, tvb, offset, 1, "Version: %d.%d", (version>>4)&0x0f, (version)&0x0f);
-    proto_tree_add_uint_hidden(pktc_tree, hf_pktc_version_major, tvb, offset, 1, (version>>4)&0x0f);
-    proto_tree_add_uint_hidden(pktc_tree, hf_pktc_version_minor, tvb, offset, 1, (version)&0x0f);
+    hidden_item = proto_tree_add_uint(pktc_tree, hf_pktc_version_major, tvb, offset, 1, (version>>4)&0x0f);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
+    hidden_item = proto_tree_add_uint(pktc_tree, hf_pktc_version_minor, tvb, offset, 1, (version)&0x0f);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
     offset+=1;
 
     /* fill COL_INFO */
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index 65b7e3c8a2..4b2db281c4 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -140,8 +140,10 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
         /* Add the field for filtering purposes */
         if (tree) {
-            proto_tree_add_uint_hidden(qllc_tree, hf_qllc_control, tvb,
+            proto_item *hidden_item;
+            hidden_item = proto_tree_add_uint(qllc_tree, hf_qllc_control, tvb,
                     1, 1, ctrl);
+            PROTO_ITEM_SET_HIDDEN(hidden_item);
         }
     }
     else {
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index 60d0de16e3..315e7bf459 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -266,7 +266,7 @@ static void
 dissect_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	guint16 rpl_len, rpl_type;
-	proto_item *ti;
+	proto_item *ti, *hidden_item;
 	proto_tree *rpl_tree;
 	tvbuff_t *next_tvb;
 
@@ -284,8 +284,9 @@ dissect_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		ti = proto_tree_add_item(tree, proto_rpl, tvb, 0, 
 			rpl_len, FALSE);
 		rpl_tree = proto_item_add_subtree(ti, ett_rpl);
-		proto_tree_add_uint_hidden(rpl_tree, hf_rpl_type, tvb, 2, 2,
+		hidden_item = proto_tree_add_uint(rpl_tree, hf_rpl_type, tvb, 2, 2,
 			rpl_type);
+		PROTO_ITEM_SET_HIDDEN(hidden_item);
 		next_tvb = tvb_new_subset(tvb, 0, -1, -1);
 		set_actual_length(next_tvb, rpl_len);
 		dissect_rpl_container(next_tvb, pinfo, rpl_tree);
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 197de48678..7a1607a08a 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -737,9 +737,10 @@ dissect_rtcp_rtpfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_item
 											16, strbuf, ""));
 						if (rtcp_rtpfb_nack_blp & (1<<i)) {
 							proto_item *hidden_ti;
-							hidden_ti = proto_tree_add_uint_hidden(bitfield_tree, hf_rtcp_rtpfb_nack_pid,
+							hidden_ti = proto_tree_add_uint(bitfield_tree, hf_rtcp_rtpfb_nack_pid,
 																   tvb, offset, 2,
 																   rtcp_rtpfb_nack_pid + i + 1);
+							PROTO_ITEM_SET_HIDDEN(hidden_ti);
 							proto_item_append_text(ti, "%d ", rtcp_rtpfb_nack_pid + i + 1);
 							nack_num_frames_lost ++;
 						}
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index e25d56778f..2101b81bc5 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -2734,8 +2734,10 @@ dissect_scsi_spc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
                              (flags & 0x10) >> 4, (flags & 0x08) >> 3,
                              (flags & 0x04) >> 2, (flags & 0x01));
         if (!((flags & 0x10) >> 4) && ((flags & 0x08) >> 3)) {
-            proto_tree_add_item_hidden (tree, hf_scsi_modesns_errrep, tvb,
+            proto_item *hidden_item;
+            hidden_item = proto_tree_add_item (tree, hf_scsi_modesns_errrep, tvb,
                                         offset+3, 1, 0);
+            PROTO_ITEM_SET_HIDDEN(hidden_item);
         }
         else {
             proto_tree_add_item (tree, hf_scsi_modesns_errrep, tvb, offset+3, 1, 0);
@@ -4054,6 +4056,7 @@ dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_,
 static void
 dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset)
 {
+    proto_item *hidden_item;
     guint8 flags;
 
     flags = tvb_get_guint8 (tvb, offset);
@@ -4072,9 +4075,10 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset)
                              "Command-Specific Information: %s",
                              tvb_bytes_to_str (tvb, offset+8, 4));
     proto_tree_add_item (sns_tree, hf_scsi_ascascq, tvb, offset+12, 2, 0);
-    proto_tree_add_item_hidden (sns_tree, hf_scsi_asc, tvb, offset+12, 1, 0);
-    proto_tree_add_item_hidden (sns_tree, hf_scsi_ascq, tvb, offset+13,
-                                    1, 0);
+    hidden_item = proto_tree_add_item (sns_tree, hf_scsi_asc, tvb, offset+12, 1, 0);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
+    hidden_item = proto_tree_add_item (sns_tree, hf_scsi_ascq, tvb, offset+13, 1, 0);
+    PROTO_ITEM_SET_HIDDEN(hidden_item);
     proto_tree_add_item (sns_tree, hf_scsi_fru, tvb, offset+14, 1, 0);
     proto_tree_add_item (sns_tree, hf_scsi_sksv, tvb, offset+15, 1, 0);
     proto_tree_add_text (sns_tree, tvb, offset+15, 3,
diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c
index a31a58e1d9..a23da863e5 100644
--- a/epan/dissectors/packet-slimp3.c
+++ b/epan/dissectors/packet-slimp3.c
@@ -228,7 +228,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     const char		*opcode_str;
     proto_tree		*slimp3_tree = NULL;
-    proto_item		*ti = NULL;
+    proto_item		*ti = NULL, *hidden_item;
     gint		i1;
     gint		offset = 0;
     guint16		opcode;
@@ -309,7 +309,8 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	* [12..17]   reserved
 	*/
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_ir, tvb, offset+8, 4, FALSE);
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_ir, tvb, offset+8, 4, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	    i1 = tvb_get_ntohl(tvb, offset+2);
 	    proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, "Uptime: %u sec (%u ticks)",
@@ -361,8 +362,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     case SLIMP3_DISPLAY:
 	if (tree) {
 
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_display,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_display,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	    /* Loop through the commands */
 	    i1 = 18;
@@ -461,8 +463,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     case SLIMP3_CONTROL:
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_control,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_control,
 				       tvb, offset+1, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Command: %s",
 				val_to_str(tvb_get_guint8(tvb, offset+1),
 					   slimp3_stream_control, "Unknown (0x%0x)"));
@@ -477,8 +480,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     case SLIMP3_HELLO:
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_hello,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_hello,
 				       tvb, offset+1, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    if (to_server) {
 		guint8 fw_ver = 0;
 		/* Hello response; client->server */
@@ -497,8 +501,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     case SLIMP3_I2C:
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_i2c,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_i2c,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    if (to_server) {
 		/* Hello response; client->server */
 		proto_tree_add_text(slimp3_tree, tvb, offset, -1,
@@ -521,8 +526,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     case SLIMP3_DATA_REQ:
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data_request,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_data_request,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    proto_tree_add_text(slimp3_tree, tvb, offset+2, 2,
 				"Requested offset: %d bytes.",
 				tvb_get_ntohs(tvb, offset+2)*2);
@@ -546,8 +552,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	*  [18..]    MPEG data
 	*/
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_data,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    if (old_protocol) {
 	        proto_tree_add_text(slimp3_tree, tvb, offset, -1,
 				    "Length: %d bytes", 
@@ -594,8 +601,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     case SLIMP3_DISC_REQ:
 	if (tree) {
 	    guint8 fw_ver;
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_discover_request,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_discover_request,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    proto_tree_add_text(slimp3_tree, tvb, offset+1, 1,
 				"Device ID: %d.", tvb_get_guint8(tvb, offset+1));
 	    fw_ver = tvb_get_guint8(tvb, offset+2);
@@ -612,8 +620,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     case SLIMP3_DISC_RSP:
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_discover_response,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_discover_response,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    proto_tree_add_text(slimp3_tree, tvb, offset+2, 4,
 				"Server Address: %s.",
 				ip_to_str(tvb_get_ptr(tvb, offset+2, 4)));
@@ -639,8 +648,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	*  [12..17]  client MAC address (v1.3 and later)
 	*/
 	if (tree) {
-	    proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data_ack,
+	    hidden_item = proto_tree_add_item(slimp3_tree, hf_slimp3_data_ack,
 				       tvb, offset, 1, FALSE);
+	    PROTO_ITEM_SET_HIDDEN(hidden_item);
 	    proto_tree_add_text(slimp3_tree, tvb, offset+6, 2,
 				"Write Pointer: %d",
 				tvb_get_ntohs(tvb, offset+6) * 2);