squelch some compiler warnings

svn path=/trunk/; revision=18560

4 files changed, 18 insertions, 17 deletions

diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 733f4e3e18..e797096f45 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -1383,6 +1383,8 @@ dissect_RealIdentificationData_block(tvbuff_t *tvb, int offset,
                             hf_pn_io_number_of_apis, &u16NumberOfAPIs);
     }
 
+    proto_item_append_text(item, ": APIs:%u", u16NumberOfAPIs);
+
     while(u16NumberOfAPIs--) {
         if(u8BlockVersionLow == 1) {
             /* API */
@@ -1393,6 +1395,9 @@ dissect_RealIdentificationData_block(tvbuff_t *tvb, int offset,
         /* NumberOfSlots */
 	    offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, 
                             hf_pn_io_number_of_slots, &u16NumberOfSlots);
+
+        proto_item_append_text(item, ", Slots:%u", u16NumberOfSlots);
+
         while(u16NumberOfSlots--) {
             /* SlotNumber */
 	        offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, 
@@ -1403,6 +1408,9 @@ dissect_RealIdentificationData_block(tvbuff_t *tvb, int offset,
             /* NumberOfSubslots */
 	        offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep, 
                                 hf_pn_io_number_of_subslots, &u16NumberOfSubslots);
+
+            proto_item_append_text(item, ", Subslots:%u", u16NumberOfSubslots);
+
             while(u16NumberOfSubslots--) {
                 subslot_item = proto_tree_add_item(tree, hf_pn_io_subslot, tvb, offset, 6, FALSE);
 	            subslot_tree = proto_item_add_subtree(subslot_item, ett_pn_io_subslot);
@@ -2094,7 +2102,7 @@ dissect_PDIRData_block(tvbuff_t *tvb, int offset,
 /* dissect the PDIRGlobalData block */
 static int
 dissect_PDIRGlobalData_block(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
+	packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint8 *drep)
 {
     e_uuid_t uuid;
 
@@ -2159,8 +2167,8 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
                         hf_pn_io_nr_of_tx_port_groups, &u8NumberOfTxPortGroups);
 
 
-/*    proto_item_append_text(item, ": Slot:0x%x/0x%x",
-        u16SlotNr, u16SubslotNr);*/
+    proto_item_append_text(item, ": Offset:%u, Len:%u, Ratio:%u, Phase:%u, FrameID:%u",
+        u32FrameSendOffset, u16DataLength, u16ReductionRatio, u16Phase, u16FrameID);
 
     return offset;
 }
@@ -2169,7 +2177,7 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
 /* dissect the DiagnosisBlock */
 static int
 dissect_DiagnosisBlock(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint16 length)
+	packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint8 *drep _U_, guint16 length)
 {
 
     /* XXX - how to decode this? */
@@ -3345,7 +3353,6 @@ static int
 dissect_IPNIO_Write_resp(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, guint8 *drep)
 {
-    guint16 u16Index = 0;
 
     offset = dissect_IPNIO_resp_header(tvb, offset, pinfo, tree, drep);
 
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index c8411c2b93..a433f90972 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -605,7 +605,7 @@ dissect_PNDCP_Suboption_DHCP(tvbuff_t *tvb, int offset, packet_info *pinfo,
 /* dissect the "LLDP" suboption */
 static int
 dissect_PNDCP_Suboption_LLDP(tvbuff_t *tvb, int offset, packet_info *pinfo, 
-                                proto_tree *tree, proto_item *block_item, proto_item *dcp_item, 
+                                proto_tree *tree, proto_item *block_item _U_, proto_item *dcp_item _U_, 
 								gboolean is_response _U_)
 {
     guint8 suboption;
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index b72bda8eef..f46d4e50de 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -65,12 +65,6 @@ static const value_string pn_mrrt_block_type_vals[] = {
 	{ 0, NULL },
 };
 
-static const value_string pn_mrrt_oui_vals[] = {
-	{ OUI_PROFINET,         "PROFINET" },
-
-	{ 0, NULL }
-};
-
 
 /* XXX - use include file instead for these helpers */
 extern int dissect_pn_uint8(tvbuff_t *tvb, gint offset, packet_info *pinfo,
@@ -98,7 +92,7 @@ extern int dissect_pn_uuid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_PNMRRT_Common(tvbuff_t *tvb, int offset, 
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 length)
+	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 length _U_)
 {
     guint16 sequence_id;
     e_uuid_t uuid;
@@ -121,7 +115,7 @@ dissect_PNMRRT_Common(tvbuff_t *tvb, int offset,
 
 static int
 dissect_PNMRRT_Test(tvbuff_t *tvb, int offset, 
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 length)
+	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 length _U_)
 {
     guint8 mac[6];
 
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index 588d604de3..f9ad16a1f4 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -274,7 +274,7 @@ dissect_pn_uuid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_PNPTCP_TLVHeader(tvbuff_t *tvb, int offset, 
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint16 *type, guint16 *length)
+	packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 *type, guint16 *length)
 {
     guint16 tl_type;
     guint16 tl_length;
@@ -467,7 +467,7 @@ dissect_PNPTCP_DelayParameter(tvbuff_t *tvb, int offset,
 
 static int
 dissect_PNPTCP_Option_PROFINET(tvbuff_t *tvb, int offset, 
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint16 length)
+	packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 length)
 {
 	guint8 subType;
     guint8 padding8;
@@ -547,7 +547,7 @@ dissect_PNPTCP_Option(tvbuff_t *tvb, int offset,
 
 static int
 dissect_PNPTCP_block(tvbuff_t *tvb, int offset, 
-	packet_info *pinfo, proto_tree *tree, proto_item *item, gboolean *end)
+	packet_info *pinfo, proto_tree *tree, proto_item *item _U_, gboolean *end)
 {
     guint16 type;
     guint16 length;