aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-3com-njack.c3
-rw-r--r--epan/dissectors/packet-3com-xns.c4
-rw-r--r--epan/dissectors/packet-3g-a11.c4
-rw-r--r--epan/dissectors/packet-9p.c4
-rw-r--r--epan/dissectors/packet-aarp.c4
-rw-r--r--epan/dissectors/packet-aastra-aasp.c2
-rw-r--r--epan/dissectors/packet-acap.c4
-rw-r--r--epan/dissectors/packet-acn.c4
-rw-r--r--epan/dissectors/packet-actrace.c2
-rw-r--r--epan/dissectors/packet-adwin-config.c4
-rw-r--r--epan/dissectors/packet-adwin.c6
-rw-r--r--epan/dissectors/packet-afp.c4
-rw-r--r--epan/dissectors/packet-afs.c5
-rw-r--r--epan/dissectors/packet-bacapp.c8
14 files changed, 51 insertions, 7 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 7cbc6f439f..37c25f3ba3 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -58,6 +58,9 @@ Specs:
#include <epan/packet.h>
#include <epan/emem.h>
+/* Forward declarations */
+void proto_register_njack(void);
+void proto_reg_handoff_njack(void);
/* protocol handles */
static int proto_njack = -1;
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index 04bd4519f7..238eb44682 100644
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.c
@@ -29,6 +29,10 @@
#include <epan/packet.h>
#include <epan/etypes.h>
+/* Forward declarations */
+void proto_register_3com_xns(void);
+void proto_reg_handoff_3com_xns(void);
+
static int proto_3com_xns = -1;
static int hf_3com_xns_type_ethertype = -1;
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index e930f2cc45..0650c77ef5 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -50,6 +50,10 @@
#include "packet-radius.h"
+/* Forward declarations */
+void proto_register_a11(void);
+void proto_register_a11(void);
+
static int registration_request_msg =0;
/* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 4c04f994fd..2d589afb81 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -36,6 +36,10 @@
#define NINEPORT 564
+/* Forward declarations */
+void proto_register_9p(void);
+void proto_reg_handoff_9p(void);
+
/*Message types for 9P */
/*See man 5 intro on Plan 9 - or;
http://www.cs.bell-labs.com/sys/man/5/INDEX.html
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index bf67abc996..ddaf120067 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -31,6 +31,10 @@
#include <epan/emem.h>
#include <epan/etypes.h>
+/* Forward declarations */
+void proto_register_aarp(void);
+void proto_reg_handoff_aarp(void);
+
static int proto_aarp = -1;
static int hf_aarp_hard_type = -1;
static int hf_aarp_proto_type = -1;
diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c
index 6f29f36220..fbace8d1f4 100644
--- a/epan/dissectors/packet-aastra-aasp.c
+++ b/epan/dissectors/packet-aastra-aasp.c
@@ -65,6 +65,8 @@
#define END_BLOCK_DATA 0xFE
+/* Forward declarations */
+void proto_register_aasp(void);
void proto_reg_handoff_aasp(void);
/* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index 53c5f57e25..57b46c3f58 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -32,6 +32,10 @@
#include <epan/packet.h>
#include <epan/strutil.h>
+/* Forward declarations */
+void proto_register_aacp(void);
+void proto_reg_handoff_aacp(void);
+
static int proto_acap = -1;
static int hf_acap_response = -1;
static int hf_acap_request = -1;
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index 7038fb181b..0271d0631a 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -47,6 +47,10 @@
#include <epan/prefs.h>
#include <epan/ipv6-utils.h>
+/* Forward declarations */
+void proto_register_acn(void);
+void proto_reg_handoff_acn(void);
+
/* pdu flags */
#define ACN_PDU_FLAG_L 0x80
#define ACN_PDU_FLAG_V 0x40
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index af08a263bf..ec61715ab7 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -38,6 +38,8 @@
#define ACTRACE_ISDN 2
+/* Forward declarations */
+void proto_register_actrace(void);
void proto_reg_handoff_actrace(void);
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c
index 60d446121a..8db659ff55 100644
--- a/epan/dissectors/packet-adwin-config.c
+++ b/epan/dissectors/packet-adwin-config.c
@@ -33,6 +33,10 @@
#include <epan/dissectors/packet-tcp.h>
#include <epan/ipproto.h>
+/* Forward declarations */
+void proto_register_adwin_config(void);
+void proto_reg_handoff_adwin_config(void);
+
/* This is registered to a different protocol */
#define ADWIN_CONFIGURATION_PORT 7000
diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index abfbaf1aca..acdf697a75 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -32,6 +32,10 @@
#include <epan/conversation.h>
#include <epan/emem.h>
+/* Forward declarations */
+void proto_register_adwin(void);
+void proto_reg_handoff_adwin(void);
+
/* This is registered to a different protocol */
#define ADWIN_COMM_PORT 6543
@@ -1164,8 +1168,6 @@ dissect_adwin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U
return (tvb_reported_length(tvb));
}
-void proto_reg_handoff_adwin(void);
-
void
proto_register_adwin(void)
{
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 5070f7e532..4a99f6c505 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -69,6 +69,10 @@ http://developer.apple.com/mac/library/documentation/Networking/Conceptual/AFP/I
Does that need a preference in case we didn't see the client and server
negotiate that?
*/
+/* Forward declarations */
+void proto_register_afp(void);
+void proto_reg_handoff_afp(void);
+
/* from netatalk/include/afp.h */
#define AFPTRANS_NONE 0
#define AFPTRANS_DDP (1 << 0)
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 4a7b80dc8c..c1f080a43f 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -46,6 +46,9 @@
#include "packet-rx.h"
+/* Forward declarations */
+void proto_register_afs(void);
+
#define AFS_PORT_FS 7000
#define AFS_PORT_CB 7001
#define AFS_PORT_PROT 7002
@@ -1533,7 +1536,7 @@ afs_init_protocol(void)
static void
dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- struct rxinfo *rxinfo = pinfo->private_data;
+ struct rxinfo *rxinfo = (rxinfo *)pinfo->private_data;
int reply = 0;
conversation_t *conversation;
struct afs_request_key request_key, *new_request_key;
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 61bc48da6f..822493366e 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -4673,7 +4673,7 @@ bacapp_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt
int instanceid_for_this_src;
gchar *dststr;
gchar *srcstr;
- const bacapp_info_value_t *binfo = p;
+ const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
srcstr = ep_strconcat("Src: ", address_to_str(&pinfo->src), NULL);
dststr = ep_strconcat("Dst: ", address_to_str(&pinfo->dst), NULL);
@@ -4719,7 +4719,7 @@ bacapp_stats_tree_service(stats_tree* st, packet_info* pinfo, epan_dissect_t* ed
gchar *dststr;
gchar *srcstr;
- const bacapp_info_value_t *binfo = p;
+ const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
srcstr = ep_strconcat("Src: ", address_to_str(&pinfo->src), NULL);
dststr = ep_strconcat("Dst: ", address_to_str(&pinfo->dst), NULL);
@@ -4757,7 +4757,7 @@ bacapp_stats_tree_objectid(stats_tree* st, packet_info* pinfo, epan_dissect_t* e
gchar *dststr;
gchar *srcstr;
- const bacapp_info_value_t *binfo = p;
+ const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
srcstr = ep_strconcat("Src: ", address_to_str(&pinfo->src), NULL);
dststr = ep_strconcat("Dst: ", address_to_str(&pinfo->dst), NULL);
@@ -4795,7 +4795,7 @@ bacapp_stats_tree_instanceid(stats_tree* st, packet_info* pinfo, epan_dissect_t*
gchar *dststr;
gchar *srcstr;
- const bacapp_info_value_t *binfo = p;
+ const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
srcstr = ep_strconcat("Src: ", address_to_str(&pinfo->src), NULL);
dststr = ep_strconcat("Dst: ", address_to_str(&pinfo->dst), NULL);