squelch some compiler warnings

svn path=/trunk/; revision=20828

4 files changed, 24 insertions, 23 deletions

diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index be94db920c..f2c36cd9de 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -1776,7 +1776,7 @@ dissect_IandM0_block(tvbuff_t *tvb, int offset,
 
 static int
 dissect_IandM1_block(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
+	packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_)
 {
     char *pTagFunction;
     char *pTagLocation;
@@ -1803,7 +1803,7 @@ dissect_IandM1_block(tvbuff_t *tvb, int offset,
 
 static int
 dissect_IandM2_block(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
+	packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_)
 {
     char *pDate;
 
@@ -1822,7 +1822,7 @@ dissect_IandM2_block(tvbuff_t *tvb, int offset,
 
 static int
 dissect_IandM3_block(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
+	packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_)
 {
     char *pDescriptor;
 
@@ -1841,7 +1841,7 @@ dissect_IandM3_block(tvbuff_t *tvb, int offset,
 
 static int
 dissect_IandM4_block(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep)
+	packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint8 *drep _U_)
 {
 
     dissect_pn_user_data(tvb, offset, pinfo, tree, 54, "IM Signature");
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index 3becc4a40d..f967521dbb 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -338,7 +338,7 @@ cba_connection_dump(cba_connection_t *conn, char *role)
             conn->consid, conn->provid, conn->provitem,
             conn->typedesclen != 0 ? val_to_str(conn->typedesc[0], dcom_variant_type_vals, "Unknown (0x%08x)") : "-",
             val_to_str(conn->qostype, cba_qos_type_short_vals, "0x%x"), conn->qosvalue,
-		    conn->connret==-1 ? "[pending]" : val_to_str(conn->connret, dcom_hresult_vals, "Unknown (0x%08x)"),
+		    conn->connret==0xffffffff ? "[pending]" : val_to_str(conn->connret, dcom_hresult_vals, "Unknown (0x%08x)"),
             conn->packet_first, conn->packet_last);
     } else {
         g_warning("   %s#%5u: CID:0x%8x PID:0x%8x PItem:\"%s\" Type:%s QoS:%s/%u Ret:%s Off:%u", 
@@ -347,13 +347,13 @@ cba_connection_dump(cba_connection_t *conn, char *role)
             conn->consid, conn->provid, conn->provitem,
             conn->typedesclen != 0 ? val_to_str(conn->typedesc[0], dcom_variant_type_vals, "Unknown (0x%08x)") : "-",
             val_to_str(conn->qostype, cba_qos_type_short_vals, "0x%x"), conn->qosvalue,
-		    conn->connret==-1 ? "[pending]" : val_to_str(conn->connret, dcom_hresult_vals, "Unknown (0x%08x)"),
+		    conn->connret==0xffffffff ? "[pending]" : val_to_str(conn->connret, dcom_hresult_vals, "Unknown (0x%08x)"),
             conn->frame_offset);
     }
 }
 
 
-void
+static void
 cba_object_dump(void)
 {
     GList *pdevs;
@@ -381,7 +381,7 @@ cba_object_dump(void)
                 frame = frames->data;
                 g_warning("  ConsFrame#%5u: CCRID:0x%x PCRID:0x%x Len:%u Ret:%s Data#%5u-#%5u", 
                     frame->packet_connect, frame->conscrid, frame->provcrid, frame->length,
-		            frame->conncrret==-1 ? "[pending]" : val_to_str(frame->conncrret, dcom_hresult_vals, "Unknown (0x%08x)"),
+		            frame->conncrret==0xffffffff ? "[pending]" : val_to_str(frame->conncrret, dcom_hresult_vals, "Unknown (0x%08x)"),
                     frame->packet_first, frame->packet_last);
                 for(conns = frame->conns; conns != NULL; conns = g_list_next(conns)) {
                     cba_connection_dump(conns->data, "ConsConn");
@@ -391,7 +391,7 @@ cba_object_dump(void)
                 frame = frames->data;
                 g_warning("  ProvFrame#%5u: CCRID:0x%x PCRID:0x%x Len:%u Ret:%s Data#%5u-#%5u", 
                     frame->packet_connect, frame->conscrid, frame->provcrid, frame->length,
-		            frame->conncrret==-1 ? "[pending]" : val_to_str(frame->conncrret, dcom_hresult_vals, "Unknown (0x%08x)"),
+		            frame->conncrret==0xffffffff ? "[pending]" : val_to_str(frame->conncrret, dcom_hresult_vals, "Unknown (0x%08x)"),
                     frame->packet_first, frame->packet_last);
                 for(conns = frame->conns; conns != NULL; conns = g_list_next(conns)) {
                     cba_connection_dump(conns->data, "ProvConn");
@@ -460,7 +460,7 @@ cba_pdev_add(packet_info *pinfo, const char *ip)
 
 
 void
-cba_pdev_link(packet_info *pinfo, cba_pdev_t *pdev, dcom_interface_t *pdev_interf)
+cba_pdev_link(packet_info *pinfo _U_, cba_pdev_t *pdev, dcom_interface_t *pdev_interf)
 {
 
     /* "crosslink" pdev interface and it's object */
@@ -473,7 +473,7 @@ cba_pdev_link(packet_info *pinfo, cba_pdev_t *pdev, dcom_interface_t *pdev_inter
 
 
 void
-cba_ldev_link(packet_info *pinfo, cba_ldev_t *ldev, dcom_interface_t *ldev_interf)
+cba_ldev_link(packet_info *pinfo _U_, cba_ldev_t *ldev, dcom_interface_t *ldev_interf)
 {
 
     /* "crosslink" interface and it's object */
@@ -486,7 +486,7 @@ cba_ldev_link(packet_info *pinfo, cba_ldev_t *ldev, dcom_interface_t *ldev_inter
 
 
 void
-cba_ldev_link_acco(packet_info *pinfo, cba_ldev_t *ldev, dcom_interface_t *acco_interf)
+cba_ldev_link_acco(packet_info *pinfo _U_, cba_ldev_t *ldev, dcom_interface_t *acco_interf)
 {
 
     /* "crosslink" interface and it's object */
@@ -534,7 +534,7 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name)
 
 cba_ldev_t *
 cba_ldev_find(packet_info *pinfo, const gchar *ip, e_uuid_t *ipid) {
-    dcerpc_info *info = (dcerpc_info *)pinfo->private_data;
+    /*dcerpc_info *info = (dcerpc_info *)pinfo->private_data;*/
     dcom_interface_t *interf;
     cba_ldev_t *ldev;
 
@@ -618,7 +618,7 @@ cba_packet_in_range(packet_info *pinfo, guint packet_connect, guint packet_disco
 
 
 void
-cba_frame_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_frame_t *frame)
+cba_frame_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, cba_frame_t *frame)
 {
 	proto_item *item;
 	proto_item *sub_item;
@@ -825,7 +825,7 @@ cba_frame_find_by_provcrid(packet_info *pinfo, cba_ldev_t *prov_ldev, guint32 pr
 
 
 void
-cba_frame_incoming_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_frame_t *frame)
+cba_frame_incoming_data(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_frame_t *frame)
 {
     if(frame->packet_first == 0) {
         frame->packet_first = pinfo->fd->num;
@@ -839,7 +839,7 @@ cba_frame_incoming_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba
 
 
 void
-cba_connection_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_connection_t *conn)
+cba_connection_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, cba_connection_t *conn)
 {
 	proto_item *item;
 	proto_item *sub_item;
@@ -1004,7 +1004,7 @@ cba_connection_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 
 cba_connection_t *
-cba_connection_find_by_provid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_ldev_t *prov_ldev, guint32 provid)
+cba_connection_find_by_provid(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_ldev_t *prov_ldev, guint32 provid)
 {
     GList *cba_iter;
     cba_connection_t *conn;
@@ -1022,7 +1022,7 @@ cba_connection_find_by_provid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
 
 
 void
-cba_connection_incoming_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_connection_t *conn)
+cba_connection_incoming_data(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_, cba_connection_t *conn)
 {
     if(conn->packet_first == 0) {
         conn->packet_first = pinfo->fd->num;
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c
index a0079ddd35..3bdc22b380 100644
--- a/plugins/profinet/packet-dcom-cba.c
+++ b/plugins/profinet/packet-dcom-cba.c
@@ -627,7 +627,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_resp(tvbuff_t *tvb, int offset,
         /* as I currently don't understand the objref process for a root interface! */
         pdev_interf = dcom_interface_new(pinfo, pinfo->net_dst.data, &uuid_ICBAPhysicalDevice, 0, 0, &info->call_data->object_uuid);    
         if(pdev_interf != NULL) {
-            pdev = cba_pdev_add(pinfo, pinfo->net_dst.data);
+            pdev = cba_pdev_add(pinfo, (const char *) (pinfo->net_dst.data) );
             cba_pdev_link(pinfo, pdev, pdev_interf);
 
             ldev = cba_ldev_add(pinfo, pdev, ldev_name);
@@ -823,7 +823,7 @@ dissect_ICBALogicalDevice_get_ACCO_resp(tvbuff_t *tvb, int offset,
             "LDev_get_ACCO: can't resolve ACCO interface pointer");
     }
 
-    ldev = cba_ldev_find(pinfo, pinfo->net_src.data, &info->call_data->object_uuid);
+    ldev = cba_ldev_find(pinfo, (const gchar *) (pinfo->net_src.data), &info->call_data->object_uuid);
     
     /* "crosslink" interface and it's object */
     if(ldev != NULL && acco_interf != NULL) {
@@ -930,9 +930,10 @@ dissect_ComponentInfo_resp(tvbuff_t *tvb, int offset,
 }
 
 
-void dissect_PBAddressInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
+static void 
+dissect_PBAddressInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, guint8 *drep,
-                       guint32 u32VarType, guint32 u32ArraySize)
+                       guint32 u32VarType _U_, guint32 u32ArraySize)
 {
     guint8  u8ID;
     guint8  u8Addr;
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index 6db442461d..76f3f0c37d 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -756,7 +756,7 @@ dissect_PNPTCP_Data_heur(tvbuff_t *tvb,
     proto_tree *ptcp_tree = NULL;
     int offset = 0;
 	guint32 u32SubStart;
-    proto_item *unknown_item = NULL;
+    /*proto_item *unknown_item = NULL;*/
 
 
     /* the tvb will NOT contain the frame_id here, so get it from our private data! */