[-Wmissing-prototypes]

Use explicit casts.

svn path=/trunk/; revision=48347

32 files changed, 91 insertions, 20 deletions

diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c
index d67220fcfc..85eab09807 100644
--- a/epan/dissectors/packet-csn1.c
+++ b/epan/dissectors/packet-csn1.c
@@ -587,7 +587,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t
       {
         gint16 count = pDescr->i;
         guint8 i     = 0;
-        CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr;
+        const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr;
 
         while (count > 0)
         {
diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c
index 99117468b7..bd004fd4c8 100644
--- a/epan/dissectors/packet-dcerpc-bossvr.c
+++ b/epan/dissectors/packet-dcerpc-bossvr.c
@@ -33,6 +33,9 @@
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
 
+void proto_register_dcerpc_bossvr(void);
+void proto_reg_handoff_dcerpc_bossvr(void);
+
 
 static int proto_bossvr = -1;
 static int hf_bossvr_opnum = -1;
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index f0d8eadf0f..fc41ac3df8 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -57,6 +57,9 @@
 #define BPDU_FLAGS_TCACK                0x02
 #define BPDU_FLAGS_TC                   0x01
 
+void proto_register_dec_bpdu(void);
+void proto_reg_handoff_dec_bpdu(void);
+
 static int proto_dec_bpdu = -1;
 static int hf_dec_bpdu_proto_id = -1;
 static int hf_dec_bpdu_type = -1;
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 52bb600253..953cc27ee9 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -63,8 +63,8 @@
 #include "packet-arp.h"
 #include "packet-dns.h"                         /* for get_dns_name() */
 
-void proto_register_dhpcv6(void);
-void proto_reg_handoff_dhpcv6(void);
+void proto_register_dhcpv6(void);
+void proto_reg_handoff_dhcpv6(void);
 
 static gboolean dhcpv6_bulk_leasequery_desegment  = TRUE;
 
diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c
index 1940b39dce..d56d2b5888 100644
--- a/epan/dissectors/packet-dvb-eit.c
+++ b/epan/dissectors/packet-dvb-eit.c
@@ -32,8 +32,8 @@
 
 #include "packet-mpeg-descriptor.h"
 
-void proto_register_dvb_data_eit(void);
-void proto_reg_handoff_dvb_data_eit(void);
+void proto_register_dvb_eit(void);
+void proto_reg_handoff_dvb_eit(void);
 
 static int proto_dvb_eit = -1;
 static int hf_dvb_eit_service_id = -1;
diff --git a/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c
index 1c525fc7fd..e7193c48ce 100644
--- a/epan/dissectors/packet-dvb-nit.c
+++ b/epan/dissectors/packet-dvb-nit.c
@@ -32,8 +32,8 @@
 
 #include "packet-mpeg-descriptor.h"
 
-void proto_register_dvb_data_nit(void);
-void proto_reg_handoff_dvb_data_nit(void);
+void proto_register_dvb_nit(void);
+void proto_reg_handoff_dvb_nit(void);
 
 static int proto_dvb_nit = -1;
 static int hf_dvb_nit_network_id = -1;
diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c
index bc378a7f33..65b1045f97 100644
--- a/epan/dissectors/packet-dvb-s2-bb.c
+++ b/epan/dissectors/packet-dvb-s2-bb.c
@@ -64,11 +64,11 @@ static guint8 crc8_table[256] = {
     0x84, 0x51, 0xFB, 0x2E, 0x7A, 0xAF, 0x05, 0xD0, 0xAD, 0x78, 0xD2, 0x07, 0x53, 0x86, 0x2C, 0xF9
 };
 
-void proto_register_dvb_dvb_s2_modeadapt(void);
 
 static dissector_handle_t ip_handle;
 static dissector_handle_t ipv6_handle;
 
+void proto_register_dvb_s2_modeadapt(void);
 void proto_reg_handoff_dvb_s2_modeadapt(void);
 
 /* preferences */
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index 3cbb6613ac..c886b8bc8f 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -36,6 +36,9 @@
 
 #include "packet-wps.h"
 
+void proto_register_eap(void);
+void proto_reg_handoff_eap(void);
+
 static int proto_eap = -1;
 static int hf_eap_code = -1;
 static int hf_eap_identifier = -1;
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 64eab66810..95caa93e5e 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -32,6 +32,9 @@
 #include "packet-ieee80211.h"
 #include <epan/etypes.h>
 
+void proto_register_eapol(void);
+void proto_reg_handoff_eapol(void);
+
 static int proto_eapol = -1;
 static int hf_eapol_version = -1;
 static int hf_eapol_type = -1;
diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c
index b52b5ca4b4..a544f71baf 100644
--- a/epan/dissectors/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
@@ -34,6 +34,9 @@
 
 #define ECHO_PORT  7
 
+void proto_register_echo(void);
+void proto_reg_handoff_echo(void);
+
 static int proto_echo = -1;
 
 static int hf_echo_data = -1;
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c
index 4f16b6a6f1..4cb549413b 100644
--- a/epan/dissectors/packet-ecp-oui.c
+++ b/epan/dissectors/packet-ecp-oui.c
@@ -45,6 +45,9 @@
 #define VDP_FIF_GROUPVID		0x03
 #define VDP_FIF_GROUPVMACVID	0x04
 
+void proto_register_ecp_oui(void);
+void proto_reg_handoff_ecp_oui(void);
+
 static gint proto_ecp = -1;
 static gint hf_ecp_pid = -1;
 static gint hf_ecp_subtype = -1;
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 322290eec2..06887ec1f0 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -45,6 +45,8 @@
 #include "packet-edonkey.h"
 #include "packet-tcp.h"
 
+void proto_reg_handoff_edonkey(void);
+
 static int proto_edonkey = -1;
 
 static int hf_edonkey_message  = -1;
@@ -1615,7 +1617,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
     /* <Search Query> ::= <Search Type> <Search> */
     proto_item *ti;
     proto_tree *search_tree;
-    guint8 search_type, operator, special_tagtype, limit_type;
+    guint8 search_type, e_operator, special_tagtype, limit_type;
     guint16 tag_name_size, string_length;
     guint32 search_length, limit;
     int string_offset, tag_name_offset;
@@ -1628,7 +1630,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
         case EDONKEY_SEARCH_BOOL:
             /* <Search> ::=  <Operator> <Search Query> <Search Query> */
             search_length += 1;
-            operator = tvb_get_guint8(tvb, offset+1);
+            e_operator = tvb_get_guint8(tvb, offset+1);
 
             /* Add subtree for search entry */
             ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA);
@@ -1636,7 +1638,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
 
             /* Add query info */
             proto_tree_add_text(search_tree, tvb, offset, 2, "Boolean search (0x%02x): %s (0x%02x)",
-                                search_type, val_to_str_const(operator, edonkey_search_ops, "Unknown"), operator);
+                                search_type, val_to_str_const(e_operator, edonkey_search_ops, "Unknown"), e_operator);
 
             offset+=2;
             offset = dissect_edonkey_search_query(tvb, pinfo, offset, search_tree);
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c
index d6e0fa5efb..4358f01c35 100644
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@@ -49,6 +49,10 @@
 #define EGD_ST_CREATEERR    28
 #define EGD_ST_DELETED      30
 
+
+void proto_register_egd(void);
+void proto_reg_handoff_egd(void);
+
 /* Translate status to string */
 static const value_string egd_stat_vals[] = {
   { EGD_ST_NONEW,                  "No new status event has occurred" },
diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c
index 74f3e05a97..e9e5b9ded7 100644
--- a/epan/dissectors/packet-ehdlc.c
+++ b/epan/dissectors/packet-ehdlc.c
@@ -36,6 +36,9 @@
 #include <epan/ipproto.h>
 #include <epan/xdlc.h>
 
+void proto_register_ehdlc(void);
+void proto_reg_handoff_ehdlc(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ehdlc = -1;
 
diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c
index 330dd2e634..457567f1e5 100644
--- a/epan/dissectors/packet-ehs.c
+++ b/epan/dissectors/packet-ehs.c
@@ -29,6 +29,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_ehs(void);
+void proto_reg_handoff_ehs(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_ehs = -1;
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index d5934c7c91..a1c0d599e9 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -324,6 +324,7 @@
 /* Forward declaration we need below (if using proto_reg_handoff...
    as a prefs callback)       */
 void proto_reg_handoff_eigrp(void);
+void proto_register_eigrp(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_eigrp = -1;
diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c
index 2960c77613..6c3a4dc4cd 100644
--- a/epan/dissectors/packet-eiss.c
+++ b/epan/dissectors/packet-eiss.c
@@ -32,6 +32,9 @@
 #include <epan/expert.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_eiss(void);
+void proto_reg_handoff_eiss(void);
+
 static int proto_eiss = -1;
 static dissector_handle_t data_handle;
 
diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c
index 1fdb78adb6..0870ba1f99 100644
--- a/epan/dissectors/packet-elcom.c
+++ b/epan/dissectors/packet-elcom.c
@@ -56,6 +56,9 @@
 #define ELCOM_LITTLE_ENDIAN  1
 #define ELCOM_BIG_ENDIAN     2
 
+void proto_register_elcom(void);
+void proto_reg_handoff_elcom(void);
+
 static int proto_elcom = -1;
 static int hf_elcom_response = -1;
 static int hf_elcom_request = -1;
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index 2d49465cce..b3c06fd215 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -44,6 +44,9 @@
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 
+void proto_register_enrp(void);
+void proto_reg_handoff_enrp(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_enrp = -1;
 static int hf_cause_code = -1;
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 7b675d91f8..f49dfbe034 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -75,6 +75,7 @@ static const value_string enttec_data_type_vals[] = {
 	{ 0,				NULL }
 };
 
+void proto_register_enttec(void);
 void proto_reg_handoff_enttec(void);
 
 /* Define the enttec proto */
@@ -190,8 +191,8 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
 		"%3u: %s"
 	};
 
-	guint8 *dmx_data = ep_alloc(512 * sizeof(guint8));
-	guint16 *dmx_data_offset = ep_alloc(513 * sizeof(guint16)); /* 1 extra for last offset */
+	guint8 *dmx_data = (guint8 *)ep_alloc(512 * sizeof(guint8));
+	guint16 *dmx_data_offset = (guint16 *)ep_alloc(513 * sizeof(guint16)); /* 1 extra for last offset */
 	emem_strbuf_t *dmx_epstr;
 
 	proto_tree *hi,*si;
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index 172527f936..4f13092af0 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -40,6 +40,9 @@
 #define PSNAME "EPMD"
 #define PFNAME "epmd"
 
+void proto_register_epmd(void);
+void proto_reg_handoff_epmd(void);
+
 static int proto_epmd = -1;
 static int hf_epmd_len = -1;
 static int hf_epmd_type = -1;
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index 233898ea13..124ad04b1d 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -71,6 +71,9 @@
 #define PSNAME "ErlDP"
 #define PFNAME "erldp"
 
+void proto_register_erlpd(void);
+void proto_reg_handoff_erlpd(void);
+
 static const value_string etf_tag_vals[] = {
   { SMALL_INTEGER_EXT , "SMALL_INTEGER_EXT" },
   { INTEGER_EXT       , "INTEGER_EXT" },
diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c
index 8362ea9e42..de5d85ffdf 100644
--- a/epan/dissectors/packet-esio.c
+++ b/epan/dissectors/packet-esio.c
@@ -33,6 +33,9 @@
 #define ESIO_TRANSFER                  0x01
 #define ESIO_STATUS                    0x02
 
+void proto_register_esio(void);
+void proto_reg_handoff_esio(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_esio = -1;
 static int hf_esio_type = -1;
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index c350a5d954..698de81fbe 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -33,6 +33,8 @@
 #include "packet-osi-options.h"
 #include "packet-esis.h"
 
+void proto_register_esis(void);
+void proto_reg_handoff_esis(void);
 
 /* esis base header */
 static int  proto_esis        = -1;
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 1c4fc80b5d..3daf9eeb7a 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -40,6 +40,9 @@
 #include <epan/tap.h>
 #include <epan/expert.h>
 
+void proto_register_eth(void);
+void proto_reg_handoff_eth(void);
+
 /* Assume all packets have an FCS */
 static gboolean eth_assume_padding = TRUE;
 static gboolean eth_assume_fcs = FALSE;
diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c
index fce51946d0..379121734e 100644
--- a/epan/dissectors/packet-etherip.c
+++ b/epan/dissectors/packet-etherip.c
@@ -30,6 +30,9 @@
 #include <epan/ipproto.h>
 #include <epan/expert.h>
 
+void proto_register_etherip(void);
+void proto_reg_handoff_etherip(void);
+
 static int proto_etherip = -1;
 static int hf_etherip_ver = -1;
 static int hf_etherip_reserved = -1;
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 142a3c0fe2..6f43608ef2 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -42,6 +42,10 @@
 #include "packet-ieee8021ah.h"
 #include "packet-vines.h"
 
+
+void proto_register_ethertype(void);
+void proto_reg_handoff_ethertype(void);
+
 static dissector_table_t ethertype_dissector_table;
 
 static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c
index 72bd44bb89..8479b4a4e6 100644
--- a/epan/dissectors/packet-etsi_card_app_toolkit.c
+++ b/epan/dissectors/packet-etsi_card_app_toolkit.c
@@ -39,6 +39,9 @@
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_sms.h"
 
+void proto_register_card_app_toolkit(void);
+void proto_reg_handoff_card_app_toolkit(void);
+
 static int proto_cat = -1;
 
 static dissector_table_t sms_dissector_table;	/* SMS TPDU */
@@ -789,7 +792,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		ti = proto_tree_add_bytes_format(cat_tree, hf_cat_tlv, tvb, pos,
 					    len, ptr, "%s: %s",
 					    val_to_str(tag, comp_tlv_tag_vals, "%02x"),
-					    tvb_bytes_to_str(tvb, pos, len));
+					    (const guint8 *)tvb_bytes_to_str(tvb, pos, len));
 #else
 		ti = proto_tree_add_bytes_format(cat_tree, hf_cat_tlv, tvb, pos,
 					    len, ptr, "%s:   ",
@@ -1081,10 +1084,6 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 }
 
-
-void
-proto_reg_handoff_card_app_toolkit(void);
-
 void
 proto_register_card_app_toolkit(void)
 {
diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c
index 1af9753d6a..b3cb08819c 100644
--- a/epan/dissectors/packet-etv.c
+++ b/epan/dissectors/packet-etv.c
@@ -32,6 +32,9 @@
 #include <epan/expert.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_etv(void);
+void proto_reg_handoff_etv(void);
+
 static int proto_etv_dii = -1;
 static int proto_etv_ddb = -1;
 
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index 8dd82cddb7..56a4fb60f8 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -46,6 +46,7 @@
 
 /* PROTOTYPES/FORWARDS */
 
+void proto_register_evrc(void);
 void proto_reg_handoff_evrc(void);
 
 static const value_string evrc_frame_type_vals[] = {
diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c
index 9b89480d2d..8ada741f06 100644
--- a/epan/dissectors/packet-exec.c
+++ b/epan/dissectors/packet-exec.c
@@ -42,6 +42,9 @@
 static gboolean preference_info_show_username = TRUE;
 static gboolean preference_info_show_command = FALSE;
 
+void proto_register_exec(void);
+void proto_reg_handoff_exec(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_exec = -1;
 
@@ -114,9 +117,9 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/* Retrieve information from conversation
 	 * or add it if it isn't there yet
 	 */
-	hash_info = conversation_get_proto_data(conversation, proto_exec);
+	hash_info = (exec_hash_entry_t *)conversation_get_proto_data(conversation, proto_exec);
 	if(!hash_info){
-		hash_info = se_alloc(sizeof(exec_hash_entry_t));
+		hash_info = se_new(exec_hash_entry_t);
 
 		hash_info->first_packet_number = pinfo->fd->num;
 		hash_info->second_packet_number = 0;
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index 008bd27b82..1826b82a3f 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -150,6 +150,10 @@ These are the structures you will see most often in EDP frames.
 #include "packet-llc.h"
 #include <epan/oui.h>
 
+void proto_register_edp(void);
+void proto_reg_handoff_edp(void);
+void proto_register_extreme_oui(void);
+
 static int hf_llc_extreme_pid = -1;
 
 static int proto_edp = -1;