12 files changed, 22 insertions, 22 deletions
diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 5c5d82e8d9..91ccae452e 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -395,7 +395,7 @@ static void NetIdFormater(tvbuff_t *tvb, guint offset, char *szText, gint nMax)
 
 
 /*ams*/
-static gint dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static gint dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
    proto_item *ti, *anItem;
    proto_tree *ams_tree = NULL, *ams_adstree, *ams_statetree;
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c
index ef171f0783..3e55ad93c3 100644
--- a/plugins/ethercat/packet-esl.c
+++ b/plugins/ethercat/packet-esl.c
@@ -260,7 +260,7 @@ void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo)
 }
 
 static gboolean
-dissect_esl_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_esl_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
     static gboolean  in_heur    = FALSE;
     gboolean         result;
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 528f31a1fd..c2e4d4540e 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -8738,7 +8738,7 @@ dissect_PNIO_C_SDU(tvbuff_t *tvb, int offset,
         data_tree = proto_item_add_subtree(data_item, ett_pn_io_rtc);
 
         /*dissect_dcerpc_uint16(tvb, offset, pinfo, data_tree, drep,hf_pn_io_packedframe_SFCRC, &u16SFCRC);*/
-        if(!(dissect_CSF_SDU_heur(tvb, pinfo, data_tree) == FALSE))
+        if(!(dissect_CSF_SDU_heur(tvb, pinfo, data_tree, NULL) == FALSE))
             return(tvb_length(tvb));
         /* XXX - dissect the remaining data */
         /* this will be one or more DataItems followed by an optional GAP and RTCPadding */
@@ -8854,8 +8854,8 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
 
 /* possibly dissect a PN-IO related PN-RT packet */
 static gboolean
-dissect_PNIO_heur(tvbuff_t *tvb,
-    packet_info *pinfo, proto_tree *tree)
+dissect_PNIO_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
     guint8  drep_data = 0;
     guint8  *drep = &drep_data;
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index f202e33ba9..476b80690b 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -3137,8 +3137,8 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb,
 
 
 static gboolean
-dissect_CBA_Connection_Data_heur(tvbuff_t *tvb,
-	packet_info *pinfo, proto_tree *tree)
+dissect_CBA_Connection_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
 	guint8  u8Version;
 	guint8  u8Flags;
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index 86e4c0c510..be32ec7a04 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -905,8 +905,8 @@ dissect_PNDCP_PDU(tvbuff_t *tvb,
 
 /* possibly dissect a PN-RT packet (frame ID must be in the appropriate range) */
 static gboolean
-dissect_PNDCP_Data_heur(tvbuff_t *tvb, 
-    packet_info *pinfo, proto_tree *tree)
+dissect_PNDCP_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
     guint16 u16FrameID;
     proto_item *item = NULL;
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index 8201ac3fa7..b60ac4dd13 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -158,8 +158,8 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset,
 
 /* possibly dissect a PN-RT packet (frame ID must be in the appropriate range) */
 static gboolean
-dissect_PNMRRT_Data_heur(tvbuff_t *tvb, 
-	packet_info *pinfo, proto_tree *tree)
+dissect_PNMRRT_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
     guint16 u16FrameID;
     proto_item *item = NULL;
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index 47065a6f6d..ec8129088e 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -726,8 +726,8 @@ dissect_PNPTCP_DelayPDU(tvbuff_t *tvb, int offset,
 
 /* possibly dissect a PN-RT packet (frame ID must be in the appropriate range) */
 static gboolean
-dissect_PNPTCP_Data_heur(tvbuff_t *tvb,
-	packet_info *pinfo, proto_tree *tree)
+dissect_PNPTCP_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
     guint16 u16FrameID;
     proto_item *item = NULL;
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 3c6b1b2f28..5aba1183ef 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -205,8 +205,8 @@ static gboolean IsDFP_Frame(tvbuff_t *tvb)
 
 /* possibly dissect a CSF_SDU related PN-RT packet */
 gboolean
-dissect_CSF_SDU_heur(tvbuff_t *tvb,
-    packet_info *pinfo, proto_tree *tree)
+dissect_CSF_SDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
     guint16 u16FrameID;
     guint16 u16SFCRC16;
@@ -299,8 +299,8 @@ dissect_CSF_SDU_heur(tvbuff_t *tvb,
 
 /* possibly dissect a FRAG_PDU related PN-RT packet */
 static gboolean
-dissect_FRAG_PDU_heur(tvbuff_t *tvb,
-    packet_info *pinfo, proto_tree *tree)
+dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+    void *data _U_)
 {
     guint16 u16FrameID;
     int offset = 0;
diff --git a/plugins/profinet/packet-pn.h b/plugins/profinet/packet-pn.h
index 0d52379850..86b02d1872 100644
--- a/plugins/profinet/packet-pn.h
+++ b/plugins/profinet/packet-pn.h
@@ -75,4 +75,4 @@ extern int dissect_pn_align4(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 extern void pn_append_info(packet_info *pinfo, proto_item *dcp_item, const char *text);
 
-extern gboolean dissect_CSF_SDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern gboolean dissect_CSF_SDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data);
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index dbf086ce9a..7443c97b26 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -59,7 +59,6 @@ static int unistim_tap = -1;
 
 void proto_reg_handoff_unistim(void);
 static void dissect_payload(proto_tree *unistim_tree,tvbuff_t *tvb,gint offset, packet_info *pinfo);
-static int dissect_unistim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
 static gint dissect_broadcast_switch(proto_tree *msg_tree,
                                      tvbuff_t *tvb,gint offset,guint msg_len);
@@ -184,7 +183,7 @@ static const value_string command_address[]={
 };
 
 static int
-dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){
+dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_){
    gint offset=0;
    proto_item *ti= NULL;
    proto_item *ti1= NULL;
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index ab82c6f70a..e4d66f7009 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -2143,7 +2143,8 @@ static int
 dissect_wimaxasncp(
     tvbuff_t *tvb,
     packet_info *pinfo,
-    proto_tree *tree)
+    proto_tree *tree,
+    void *data _U_)
 {
     const gchar *unknown = "Unknown";
 
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/wimaxmacphy/packet-wimaxmacphy.c
index 164206ee86..4270c3769a 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.c
+++ b/plugins/wimaxmacphy/packet-wimaxmacphy.c
@@ -2388,7 +2388,7 @@ static guint dissect_wimaxmacphy_phy_rxcdma_indication(tvbuff_t *tvb, guint offs
 }
 
 static int
-dissect_wimaxmacphy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_wimaxmacphy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
     /* Set up structures needed to add the protocol subtree and manage it */
     proto_tree *wimaxmacphy_tree, *primitive_tree;