Fix some trivial warnings.

svn path=/trunk/; revision=54085

58 files changed, 163 insertions, 24 deletions

diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c
index aab047681d..e3ac67bf26 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.c
+++ b/epan/dissectors/packet-dcerpc-atsvc.c
@@ -28,6 +28,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-atsvc.h"
 
+void proto_register_dcerpc_atsvc(void);
+void proto_reg_handoff_dcerpc_atsvc(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_atsvc = -1;
 static gint ett_atsvc_atsvc_DaysOfMonth = -1;
diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c
index e3f41cb023..02668f2f93 100644
--- a/epan/dissectors/packet-dcerpc-budb.c
+++ b/epan/dissectors/packet-dcerpc-budb.c
@@ -38,6 +38,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-budb.h"
 
+void proto_register_budb(void);
+void proto_reg_handoff_budb(void);
+
 static int proto_budb = -1;
 
 
diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c
index d7f1abd64a..0c55c1b3ef 100644
--- a/epan/dissectors/packet-dcerpc-butc.c
+++ b/epan/dissectors/packet-dcerpc-butc.c
@@ -37,6 +37,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-butc.h"
 
+void proto_register_butc(void);
+void proto_reg_handoff_butc(void);
+
 static int proto_butc = -1;
 
 
diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c
index 6558804eb7..0c01920797 100644
--- a/epan/dissectors/packet-dcerpc-dssetup.c
+++ b/epan/dissectors/packet-dcerpc-dssetup.c
@@ -28,6 +28,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-dssetup.h"
 
+void proto_register_dcerpc_dssetup(void);
+void proto_reg_handoff_dcerpc_dssetup(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_dssetup = -1;
 static gint ett_dssetup_dssetup_DsRoleFlags = -1;
diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c
index 11e5ce3a14..79440ff978 100644
--- a/epan/dissectors/packet-dcerpc-efs.c
+++ b/epan/dissectors/packet-dcerpc-efs.c
@@ -28,6 +28,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-efs.h"
 
+void proto_register_dcerpc_efs(void);
+void proto_reg_handoff_dcerpc_efs(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_efs = -1;
 static gint ett_efs_EFS_HASH_BLOB = -1;
diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c
index 06ba66c3fb..69eca0e039 100644
--- a/epan/dissectors/packet-dcerpc-frstrans.c
+++ b/epan/dissectors/packet-dcerpc-frstrans.c
@@ -29,6 +29,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-frstrans.h"
 
+void proto_register_dcerpc_frstrans(void);
+void proto_reg_handoff_dcerpc_frstrans(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_frstrans = -1;
 static gint ett_frstrans_frstrans_TransportFlags = -1;
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index 5bdccb1a67..b5d0583e60 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
@@ -28,6 +28,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-initshutdown.h"
 
+void proto_register_dcerpc_initshutdown(void);
+void proto_reg_handoff_dcerpc_initshutdown(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_initshutdown = -1;
 static gint ett_initshutdown_initshutdown_ReasonFlags = -1;
diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c
index ddaf95c3f3..7befde13fe 100644
--- a/epan/dissectors/packet-dcerpc-nspi.c
+++ b/epan/dissectors/packet-dcerpc-nspi.c
@@ -22,6 +22,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-nspi.h"
 
+void proto_register_dcerpc_nspi(void);
+void proto_reg_handoff_dcerpc_nspi(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_nspi = -1;
 static gint ett_nspi_MAPIUID = -1;
diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c
index 710b3c9cd1..2aade1531b 100644
--- a/epan/dissectors/packet-dcerpc-rfr.c
+++ b/epan/dissectors/packet-dcerpc-rfr.c
@@ -29,6 +29,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-rfr.h"
 
+void proto_register_dcerpc_rfr(void);
+void proto_reg_handoff_dcerpc_rfr(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_rfr = -1;
 
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c
index 1b45b98a0a..ac6d94ed0c 100644
--- a/epan/dissectors/packet-dcerpc-srvsvc.c
+++ b/epan/dissectors/packet-dcerpc-srvsvc.c
@@ -29,6 +29,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-srvsvc.h"
 
+void proto_register_dcerpc_srvsvc(void);
+void proto_reg_handoff_dcerpc_srvsvc(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_srvsvc = -1;
 static gint ett_srvsvc_srvsvc_NetCharDevInfo0 = -1;
diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c
index 73a69b0607..1f4fc8c835 100644
--- a/epan/dissectors/packet-dcerpc-wkssvc.c
+++ b/epan/dissectors/packet-dcerpc-wkssvc.c
@@ -29,6 +29,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-wkssvc.h"
 
+void proto_register_dcerpc_wkssvc(void);
+void proto_reg_handoff_dcerpc_wkssvc(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_wkssvc = -1;
 static gint ett_wkssvc_lsa_String = -1;
diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c
index 73adc0f073..75892ef33b 100644
--- a/epan/dissectors/packet-dcerpc-wzcsvc.c
+++ b/epan/dissectors/packet-dcerpc-wzcsvc.c
@@ -28,6 +28,9 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-wzcsvc.h"
 
+void proto_register_dcerpc_wzcsvc(void);
+void proto_reg_handoff_dcerpc_wzcsvc(void);
+
 /* Ett declarations */
 static gint ett_dcerpc_wzcsvc = -1;
 
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 691f028b0e..ba7dcffd8b 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -66,6 +66,9 @@
 #include "packet-tcp.h"
 #include "packet-diameter.h"
 
+void proto_register_diameter(void);
+void proto_reg_handoff_diameter(void);
+
 /* Diameter Header Flags */
 /* RPETrrrrCCCCCCCCCCCCCCCCCCCCCCCC  */
 #define DIAM_FLAGS_R 0x80
@@ -1745,9 +1748,6 @@ dictionary_load(void)
 	return 1;
 }
 
-/* registration with the filtering engine */
-void proto_reg_handoff_diameter(void);
-
 /*
  * This does most of the registration work; see proto_register_diameter()
  * for the reason why we split it off.
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 43e7a72993..e1c90b38ca 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -57,6 +57,8 @@
 #include <wsutil/wsgcrypt.h>
 #endif
 
+void proto_register_dvbci(void);
+void proto_reg_handoff_dvbci(void);
 
 #define AES_BLOCK_LEN 16
 #define AES_KEY_LEN 16
@@ -446,8 +448,6 @@ typedef struct _apdu_info_t {
 } apdu_info_t;
 
 
-void proto_reg_handoff_dvbci(void);
-
 static void
 dissect_dvbci_payload_rm(guint32 tag, gint len_field,
         tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 2a23d26456..0f8a73c54d 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -34,6 +34,9 @@
 #include <epan/llcsaps.h>
 #include "packet-hpext.h"
 
+void proto_register_hpext(void);
+void proto_reg_handoff_hpext(void);
+
 static dissector_handle_t hpext_handle;
 
 static dissector_table_t subdissector_table;
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 841d66cc1f..c33e98865e 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -57,6 +57,9 @@
 #include <epan/geoip_db.h>
 #endif /* HAVE_GEOIP_V6 */
 
+void proto_register_ipv6(void);
+void proto_reg_handoff_ipv6(void);
+
 /* Option types and related macros */
 #define IP6OPT_PAD1                     0x00    /* 00 0 00000 */
 #define IP6OPT_PADN                     0x01    /* 00 0 00001 */
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 2440d138f4..b5874e8466 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -4833,7 +4833,7 @@ dissect_gspm(tvbuff_t *tvb, int offset, int length, proto_tree *tree)
 #ifdef HAVE_LIBGCRYPT
 static guint
 isakmp_hash_func(gconstpointer c) {
-  const guint8 *i_cookie = (guint8 *) c;
+  const guint8 *i_cookie = (const guint8 *) c;
   guint   val = 0, keychunk, i;
 
   /* XOR our icookie down to the size of a guint */
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index be87693edb..10883f1038 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -39,6 +39,9 @@
 
 #include "packet-ber.h"
 
+void proto_register_jpeg(void);
+void proto_reg_handoff_jpeg(void);
+
 static dissector_handle_t jpeg_handle;
 
 static header_field_info *hfi_jpeg = NULL;
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c
index 6b90589910..a4a8e72fce 100644
--- a/epan/dissectors/packet-json.c
+++ b/epan/dissectors/packet-json.c
@@ -37,6 +37,9 @@
 #include <epan/packet.h>
 #include <epan/tvbparse.h>
 
+void proto_register_json(void);
+void proto_reg_handoff_json(void);
+
 static dissector_handle_t json_handle;
 
 static gint ett_json = -1;
@@ -560,7 +563,8 @@ static void init_json_parser(void) {
 }
 
 void
-proto_register_json(void) {
+proto_register_json(void)
+{
 	static gint *ett[] = {
 		&ett_json,
 		&ett_json_array,
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index a7f73f7f82..50e091847c 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <glib.h>
 
+void proto_register_kdp(void);
+void proto_reg_handoff_kdp(void);
+
 #define KDP_PORT 19948
 #define BUFFER_SIZE 80
 static int proto_kdp = -1;
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index d95fd4d5be..7511e2bbb6 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -35,6 +35,9 @@
 #include "packet-kerberos.h"
 #include "packet-isakmp.h"
 
+void proto_register_kink(void);
+void proto_reg_handoff_kink(void);
+
 #define KINK_PORT       57203
 
 #define KINK_ISAKMP_PAYLOAD_BASE 14
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index 42661312ca..fc9996be04 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -47,6 +47,11 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
+void proto_register_linx(void);
+void proto_reg_handoff_linx(void);
+void proto_register_linx_tcp(void);
+void proto_reg_handoff_linx_tcp(void);
+
 /* forward reference */
 static void dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
@@ -974,7 +979,7 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 }
 
-	void
+void
 proto_register_linx_tcp(void)
 {
 	static hf_register_info hf[] = {
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index b636554511..b6cac888c0 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -40,6 +40,9 @@
 #include "packet-giop.h"
 #include "packet-tcp.h"
 
+void proto_register_miop(void);
+void proto_reg_handoff_miop(void);
+
 /*
  * Useful visible data/structs
  */
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index d9a7980646..39b4f4d469 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -42,6 +42,9 @@
 
 #include <epan/tvbuff-int.h> /* XXX, for tvb_new_proxy() */
 
+void proto_register_mp2t(void);
+void proto_reg_handoff_mp2t(void);
+
 /* The MPEG2 TS packet size */
 #define MP2T_PACKET_SIZE 188
 #define MP2T_SYNC_BYTE   0x47
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index 2cf3eee0d5..f6f7997caf 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -33,6 +33,9 @@
 #include <epan/crc8-tvb.h>
 #include <expert.h>
 
+void proto_register_mux27010(void);
+void proto_reg_handoff_mux27010(void);
+
 #define PROTO_TAG_MUX27010  "MUX27010"
 
 /*Extended Header*/
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 9047b40486..20a4ffd057 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -47,6 +47,9 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
+void proto_register_mysql(void);
+void proto_reg_handoff_mysql(void);
+
 /* port for protocol registration */
 #define TCP_PORT_MySQL   3306
 
diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index f1f5c20deb..5b6eb2441b 100644
--- a/epan/dissectors/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
@@ -31,6 +31,11 @@
 #include "packet-ipx.h"
 #include "packet-netbios.h"
 
+void proto_register_nbipx(void);
+void proto_reg_handoff_nbipx(void);
+void proto_register_nmpi(void);
+void proto_reg_handoff_nmpi(void);
+
 static int proto_nbipx = -1;
 static int hf_nbipx_packettype = -1;
 static int hf_nbipx_name_flags = -1;
diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c
index 1e028ce97a..b0dd581a36 100644
--- a/epan/dissectors/packet-nflog.c
+++ b/epan/dissectors/packet-nflog.c
@@ -32,6 +32,9 @@
 #include <epan/prefs.h>
 #include <epan/aftypes.h>
 
+void proto_register_nflog(void);
+void proto_reg_handoff_nflog(void);
+
 /* nfulnl_attr_type enum from <linux/netfilter/nfnetlink_log.h> */
 enum ws_nfulnl_attr_type {
 	WS_NFULA_UNSPEC,
diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
index fb29ac9fa2..835e1d73ce 100644
--- a/epan/dissectors/packet-nfsacl.c
+++ b/epan/dissectors/packet-nfsacl.c
@@ -32,6 +32,9 @@
 #include "packet-rpc.h"
 #include "packet-nfs.h"
 
+void proto_register_nfsacl(void);
+void proto_reg_handoff_nfsacl(void);
+
 static int proto_nfsacl = -1;
 static int hf_nfsacl_mask = -1;
 static int hf_nfsacl_mask_acl_entry = -1;
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c
index a8cf3257bc..5b19b0ba3d 100644
--- a/epan/dissectors/packet-noe.c
+++ b/epan/dissectors/packet-noe.c
@@ -30,6 +30,9 @@
 #include "epan/packet.h"
 #include <epan/wmem/wmem.h>
 
+void proto_register_noe(void);
+void proto_reg_handoff_noe(void);
+
 #define OPCODE_C_context             0
 #define OPCODE_C_terminal            1
 #define OPCODE_C_keyboard            2
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c
index d7a5c7c710..961538207d 100644
--- a/epan/dissectors/packet-nstrace.c
+++ b/epan/dissectors/packet-nstrace.c
@@ -30,6 +30,9 @@
 #include <epan/wmem/wmem.h>
 #include <wiretap/netscaler.h>
 
+void proto_register_ns(void);
+void proto_reg_handoff_ns(void);
+
 static int proto_nstrace = -1;
 
 static int hf_ns_nicno = -1;
diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index e5d80c990f..421b4ee88a 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -39,6 +39,9 @@
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/ipproto.h>
 
+void proto_register_openvpn(void);
+void proto_reg_handoff_openvpn(void);
+
 #define PFNAME "openvpn"
 #define PNAME  "OpenVPN Protocol"
 #define PSNAME "OpenVPN"
@@ -93,8 +96,6 @@ static guint    pref_tcp_port          = OPENVPN_PORT;
 static guint    pref_udp_port          = OPENVPN_PORT;
 static guint    tls_auth_hmac_size     = 20; /* Default SHA-1 160 Bits */
 
-void proto_reg_handoff_openvpn(void); /* forward declaration for use in preferences registration */
-
 static const value_string openvpn_message_types[] =
 {
   {   P_CONTROL_HARD_RESET_CLIENT_V1,  "P_CONTROL_HARD_RESET_CLIENT_V1" },
diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c
index 5f262d06d7..361e26428c 100644
--- a/epan/dissectors/packet-openwire.c
+++ b/epan/dissectors/packet-openwire.c
@@ -51,6 +51,9 @@
 #include <epan/wmem/wmem.h>
 #include "packet-tcp.h"
 
+void proto_register_openwire(void);
+void proto_reg_handoff_openwire(void);
+
 static int proto_openwire = -1;
 static int hf_openwire_none = -1;
 static int hf_openwire_length = -1;
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index bf2313512c..d4dd4792ae 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -31,6 +31,9 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 
+void proto_register_pagp(void);
+void proto_reg_handoff_pagp(void);
+
 /* Offsets of fields within a PagP PDU */
 
 #define PAGP_VERSION_NUMBER		0
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index fcf31e5205..fa85537358 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -36,6 +36,9 @@
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_pana(void);
+void proto_reg_handoff_pana(void);
+
 #if 0
 #define PANA_UDP_PORT 3001
 #endif
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 771c413bdc..f6dc8f1741 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -41,6 +41,11 @@ http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/if_pflog.h
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
 
+void proto_register_pflog(void);
+void proto_reg_handoff_pflog(void);
+void proto_register_old_pflog(void);
+void proto_reg_handoff_old_pflog(void);
+
 static dissector_handle_t  data_handle, ip_handle, ipv6_handle;
 
 /* header fields */
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index c487f97f46..7225989a83 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -33,6 +33,8 @@
 
 #include "packet-tcp.h"
 
+void proto_register_pgsql(void);
+void proto_reg_handoff_pgsql(void);
 
 static int proto_pgsql = -1;
 static int hf_frontend = -1;
@@ -666,9 +668,6 @@ dissect_pgsql(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 }
 
 void
-proto_reg_handoff_pgsql(void);
-
-void
 proto_register_pgsql(void)
 {
     static hf_register_info hf[] = {
diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index 3c84e1fceb..152f8fe12f 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -35,6 +35,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_pktgen(void);
+void proto_reg_handoff_pktgen(void);
+
 /* magic num used for heuristic */
 #define PKTGEN_MAGIC 0xbe9be955
 
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index 339533d07a..97ce3347c6 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -49,6 +49,8 @@
 #include "packet-pw-atm.h"
 #include "packet-pw-common.h"
 
+void proto_register_pw_atm_ata(void);
+void proto_reg_handoff_pw_atm_ata(void);
 void proto_register_pw_atm(void);
 void proto_reg_handoff_pw_atm(void);
 
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 08c2c88ea5..229b146d82 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -78,6 +78,7 @@
 
 #include "packet-radius.h"
 
+void proto_register_radius(void);
 void proto_reg_handoff_radius(void);
 
 typedef struct _e_radiushdr {
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index 690e6b3d6f..54048bf4d1 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -34,6 +34,9 @@
 #include "packet-ip.h"
 #include "packet-ppp.h"
 
+void proto_register_raw(void);
+void proto_reg_handoff_raw(void);
+
 static int proto_raw = -1;
 static gint ett_raw = -1;
 
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index 5df809308a..19156d91ed 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -47,6 +47,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_rdm(void);
+
 #define RDM_SC_RDM				0xCC
 #define RDM_SC_SUB_MESSAGE			0x01
 
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 6f64f9df33..25d5ecd3a7 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -46,6 +46,8 @@
 #include <packet-ssl-utils.h>
 #include <packet-reload.h>
 
+void proto_register_reload(void);
+void proto_reg_handoff_reload(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_reload = -1;
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 5e0c3831f5..ac13a36af3 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -45,8 +45,8 @@
 #include "packet-rtp.h"
 #include <epan/tap.h>
 
-void proto_register_rtp_event(void);
-void proto_reg_handoff_rtp_event(void);
+void proto_register_rtp_events(void);
+void proto_reg_handoff_rtp_events(void);
 
 /*  rtp_event_payload_type_value is the value used globally
 	to set the appropriate payload type
@@ -75,9 +75,6 @@ static int hf_rtp_events_duration = -1; /* sixteen bits */
 
 static gint ett_rtp_events           = -1;
 
-void
-proto_reg_handoff_rtp_events(void);
-
 static struct _rtp_event_info rtp_event_info;
 
 static void
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index b6d3889238..a5eeb79e35 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -29,6 +29,9 @@
 #include <epan/reassemble.h>
 #include "packet-usb.h"
 
+void proto_register_usb_audio(void);
+void proto_reg_handoff_usb_audio(void);
+
 /* protocols and header fields */
 static int proto_usb_audio = -1;
 static int hf_midi_cable_number = -1;
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index d0d342da6e..b4db97203a 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -30,6 +30,9 @@
 #include "packet-usb.h"
 #include "packet-scsi.h"
 
+void proto_register_usb_ms(void);
+void proto_reg_handoff_usb_ms(void);
+
 /* protocols and header fields */
 static int proto_usb_ms = -1;
 static int hf_usb_ms_dCBWSignature = -1;
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c
index 79213f096e..ce1e886662 100644
--- a/epan/dissectors/packet-usb-video.c
+++ b/epan/dissectors/packet-usb-video.c
@@ -32,6 +32,8 @@
 #include <epan/conversation.h>
 #include "packet-usb.h"
 
+void proto_register_usb_vid(void);
+
 /* References are to sections in USB Video Class specifications -
  * specifically V1.5, but versions have tended to keep
  * the same numbering (as of this writing).
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index a0700a20da..1533ac6648 100644
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -35,6 +35,9 @@
 #include <epan/ipv4.h>
 #include "packet-wccp.h"
 
+void proto_register_wccp(void);
+void proto_reg_handoff_wccp(void);
+
 static int proto_wccp = -1;
 static int hf_wccp_message_type = -1;   /* the message type */
 static int hf_wccp_version = -1;        /* protocol version */
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index 8ebd17bd48..769b6155c4 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -42,6 +42,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_winsrepl(void);
+void proto_reg_handoff_winsrepl(void);
+
 static gboolean winsrepl_reassemble = TRUE;
 
 static int proto_winsrepl = -1;
diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c
index 9b8931f383..8b51bffcad 100644
--- a/epan/dissectors/packet-wps.c
+++ b/epan/dissectors/packet-wps.c
@@ -43,6 +43,8 @@
 
 #include "packet-wps.h"
 
+void proto_register_wps(void);
+
 static int  hf_eapwps_opcode     = -1;
 static int  hf_eapwps_flags      = -1;
 static int  hf_eapwps_flag_mf    = -1;
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 9f34ca53ee..cf857d947d 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -51,6 +51,9 @@
 
 #include "packet-xml.h"
 
+void proto_register_xml(void);
+void proto_reg_handoff_xml(void);
+
 struct _attr_reg_data {
     wmem_array_t *hf;
     const gchar *basename;
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
index 3715a49002..88810688e3 100644
--- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c
+++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
@@ -79,6 +79,7 @@
 /*************************/
 void proto_register_zbee_zcl_illum_meas(void);
 void proto_reg_handoff_zbee_zcl_illum_meas(void);
+void proto_register_zbee_zcl_temp_meas(void);
 void proto_reg_handoff_zbee_zcl_temp_meas(void);
 void proto_register_zbee_zcl_press_meas(void);
 void proto_reg_handoff_zbee_zcl_press_meas(void);
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 213e149ae8..a9cfcb35e7 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -82,8 +82,8 @@ static gint compare_doubles(gconstpointer a, gconstpointer b)
 {
     double ad, bd;
 
-    ad = *(double *)a;
-    bd = *(double *)b;
+    ad = *(const double *)a;
+    bd = *(const double *)b;
 
     if (ad < bd)
         return -1;
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index fb486c0ee2..89da415425 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -83,8 +83,8 @@ static gint compare_doubles(gconstpointer a, gconstpointer b)
 {
     double ad, bd;
 
-    ad = *(double *)a;
-    bd = *(double *)b;
+    ad = *(const double *)a;
+    bd = *(const double *)b;
 
     if (ad < bd)
         return -1;
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index ac826c3543..e5de1f82ad 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -847,7 +847,7 @@ iostat_draw(void *arg)
 
                 do {
                     if (len_filt > max_w) {
-                        sfilter1 = g_strndup( (gchar *) filter, (gsize) max_w);
+                        sfilter1 = g_strndup(filter, (gsize) max_w);
                         /*
                         * Find the pos of the last space in sfilter1. If a space is found, set
                         * sfilter2 to the string prior to that space and print it; otherwise, wrap
@@ -1478,7 +1478,7 @@ iostat_init(const char *opt_arg, void* userdata _U_)
                 register_io_tap(io, i, NULL);
             } else if (pos==NULL) {
                 str = (const char*) g_strstrip((gchar*)str);
-                filter = g_strdup((gchar*) str);
+                filter = g_strdup(str);
                 if (*filter)
                     register_io_tap(io, i, filter);
                 else
diff --git a/ui/gtk/hostlist_tr.c b/ui/gtk/hostlist_tr.c
index 4aa72b409e..e4c6b3756c 100644
--- a/ui/gtk/hostlist_tr.c
+++ b/ui/gtk/hostlist_tr.c
@@ -38,6 +38,8 @@
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
 
+void register_tap_listener_tr_hostlist(void);
+
 static int
 tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
diff --git a/ui/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c
index 74586ac08c..a7f79cd42b 100644
--- a/ui/gtk/hostlist_udpip.c
+++ b/ui/gtk/hostlist_udpip.c
@@ -38,6 +38,8 @@
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
 
+void register_tap_listener_udpip_hostlist(void);
+
 static int
 udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
diff --git a/ui/gtk/hostlist_usb.c b/ui/gtk/hostlist_usb.c
index 427028f7d6..40ebf782e1 100644
--- a/ui/gtk/hostlist_usb.c
+++ b/ui/gtk/hostlist_usb.c
@@ -38,6 +38,8 @@
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
 
+void register_tap_listener_usb_hostlist(void);
+
 static int
 usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_)
 {