summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-cfdp.c3
-rw-r--r--epan/dissectors/packet-isis-hello.c4
-rw-r--r--epan/dissectors/packet-isis-lsp.c2
-rw-r--r--plugins/irda/packet-ircomm.c2
-rw-r--r--plugins/mate/packet-mate.c3
-rw-r--r--plugins/opcua/opcua_simpletypes.c2
-rw-r--r--plugins/opcua/opcua_simpletypes.h3
-rw-r--r--plugins/profinet/packet-dcerpc-pn-io.c3
-rw-r--r--plugins/profinet/packet-dcom-cba-acco.c3
-rw-r--r--plugins/profinet/packet-dcom-cba.c2
-rw-r--r--plugins/profinet/packet-pn-dcp.c3
-rw-r--r--plugins/profinet/packet-pn-mrp.c2
-rw-r--r--plugins/profinet/packet-pn-mrrt.c3
-rw-r--r--plugins/profinet/packet-pn-ptcp.c3
-rw-r--r--plugins/profinet/packet-pn-rt.c4
-rw-r--r--plugins/unistim/packet-unistim.c2
16 files changed, 39 insertions, 5 deletions
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index 0685ab8bcc..ccf99d5cb6 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -36,6 +36,9 @@
* The Store and Forward Overlay Operations are not included.
*/
+void proto_register_cfdp(void);
+void proto_reg_handoff_cfdp(void);
+
/* Initialize the protocol and registered fields */
static int proto_cfdp = -1;
static int hf_cfdp_version = -1;
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index d14a316d06..5408f1560e 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -65,9 +65,13 @@
proto_item_append_text(item, string, sep); \
sep = cont_sep; \
}
+
static const char initial_sep[] = " (";
static const char cont_sep[] = ", ";
+void proto_register_isis_hello(void);
+void proto_reg_handoff_isis_hello(void);
+
static int proto_isis_hello = -1;
/* hello packets */
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 7d90b8a1c3..72569275ef 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -105,6 +105,8 @@
#define FP_HMAC_SSWID_MASK G_GINT64_CONSTANT(0x0000FFFF0000)
#define FP_HMAC_LID_MASK G_GINT64_CONSTANT(0x00000000FFFF)
+void proto_register_isis_lsp(void);
+void proto_reg_handoff_isis_lsp(void);
static int proto_isis_lsp = -1;
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index a894181d16..20caa596a5 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -118,6 +118,8 @@
#define IRCOMM_CD 0x80 /* Carrier detect is high */
#define IRCOMM_DCE_DELTA_ANY 0x0f
+void proto_reg_handoff_ircomm(void);
+
/* Initialize the subtree pointers */
static gint ett_ircomm = -1;
static gint ett_ircomm_ctrl = -1;
diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c
index 7b45b18fec..1abeb96cb1 100644
--- a/plugins/mate/packet-mate.c
+++ b/plugins/mate/packet-mate.c
@@ -32,6 +32,9 @@
#include "mate.h"
+void proto_register_mate(void);
+void proto_reg_handoff_mate(void);
+
static int mate_tap_data = 0;
static mate_config* mc = NULL;
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index 2126ecd8b6..f8a52caeb5 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -54,8 +54,6 @@
/* Chosen arbitrarily */
#define MAX_ARRAY_LEN 10000
-void dispatchExtensionObjectType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int TypeId);
-
static int hf_opcua_diag_mask_symbolicflag = -1;
static int hf_opcua_diag_mask_namespaceflag = -1;
static int hf_opcua_diag_mask_localizedtextflag = -1;
diff --git a/plugins/opcua/opcua_simpletypes.h b/plugins/opcua/opcua_simpletypes.h
index dd815aadfb..5eed3da701 100644
--- a/plugins/opcua/opcua_simpletypes.h
+++ b/plugins/opcua/opcua_simpletypes.h
@@ -55,3 +55,6 @@ void parseArrayEnum(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, fctEnumParse
void parseArrayComplex(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName, fctComplexTypeParser pParserFunction);
void registerSimpleTypes(int proto);
guint32 getExtensionObjectType(tvbuff_t *tvb, gint *pOffset);
+
+void dispatchExtensionObjectType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int TypeId);
+
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index d84cceb70f..84dcc86c5f 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -59,7 +59,8 @@
#include "packet-pn.h"
-
+void proto_register_pn_io(void);
+void proto_reg_handoff_pn_io(void);
static int proto_pn_io = -1;
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index 6198cd1413..0e8606eced 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -35,6 +35,9 @@
#include <epan/dissectors/packet-dcom.h>
#include "packet-dcom-cba-acco.h"
+void proto_register_dcom_cba_acco(void);
+void proto_reg_handoff_dcom_cba_acco(void);
+
static int hf_cba_acco_opnum = -1;
static int hf_cba_acco_ping_factor = -1;
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c
index cd06bc8bc8..17a46ba1d7 100644
--- a/plugins/profinet/packet-dcom-cba.c
+++ b/plugins/profinet/packet-dcom-cba.c
@@ -33,6 +33,8 @@
#include <epan/dissectors/packet-dcom-dispatch.h>
#include "packet-dcom-cba-acco.h"
+void proto_register_dcom_cba(void);
+void proto_reg_handoff_dcom_cba(void);
static int hf_cba_opnum = -1;
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index 4ded170b91..68529cb7f3 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -38,7 +38,8 @@
#include "packet-pn.h"
-
+void proto_register_pn_dcp(void);
+void proto_reg_handoff_pn_dcp(void);
static int proto_pn_dcp = -1;
diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c
index 697c2f33fe..7cdaaf2e90 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/profinet/packet-pn-mrp.c
@@ -33,6 +33,8 @@
#include "packet-pn.h"
+void proto_register_pn_mrp(void);
+void proto_reg_handoff_pn_mrp(void);
static int proto_pn_mrp = -1;
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index a604b22b47..3c03399643 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -33,6 +33,9 @@
#include "packet-pn.h"
+void proto_register_pn_mrrt(void);
+void proto_reg_handoff_pn_mrrt(void);
+
static int proto_pn_mrrt = -1;
static int hf_pn_mrrt_sequence_id = -1;
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index 9b34627ea0..8d800dd910 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -33,7 +33,8 @@
#include "packet-pn.h"
-
+void proto_register_pn_ptcp(void);
+void proto_reg_handoff_pn_ptcp(void);
static int proto_pn_ptcp = -1;
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 2b3ea81205..b3e1b61942 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -48,6 +48,10 @@
#include <wsutil/crc16-plain.h>
#include "packet-pn.h"
+
+void proto_register_pn_rt(void);
+void proto_reg_handoff_pn_rt(void);
+
/* Define the pn-rt proto */
static int proto_pn_rt = -1;
static gboolean pnio_desegment = TRUE;
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index 9c67106fd6..b28a71b5b7 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -47,6 +47,8 @@
#include "uftp.h"
#include "expansion.h"
+void proto_register_unistim(void);
+
/* Don't set this to 5000 until this dissector is made a heuristic one!
It collides (at least) with tapa.
static guint global_unistim_port = 5000; */