- Forward declaration of register functions.

svn path=/trunk/; revision=53971

38 files changed, 136 insertions, 1 deletions

diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c
index 638a1cfd40..24095a197f 100644
--- a/epan/dissectors/packet-pingpongprotocol.c
+++ b/epan/dissectors/packet-pingpongprotocol.c
@@ -36,6 +36,8 @@
 
 #define PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097602
 
+void proto_register_pingpongprotocol(void);
+void proto_reg_handoff_pingpongprotocol(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_pingpongprotocol         = -1;
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index ae86ad2b26..fd9b90b205 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -43,6 +43,11 @@
 #define PKTC_PORT	1293
 #define PKTC_MTAFQDN_PORT	2246
 
+void proto_register_pktc(void);
+void proto_reg_handoff_pktc(void);
+void proto_register_pktc_mtafqdn(void);
+void proto_reg_handoff_pktc_mtafqdn(void);
+
 static int proto_pktc = -1;
 static gint hf_pktc_app_spec_data = -1;
 static gint hf_pktc_list_of_ciphersuites = -1;
diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c
index 05b65893d4..ebc8b5f9c6 100644
--- a/epan/dissectors/packet-pnrp.c
+++ b/epan/dissectors/packet-pnrp.c
@@ -105,6 +105,9 @@
 #define FLAGS_ENCODED_CPA_C           0x08
 #define FLAGS_ENCODED_CPA_F           0x10
 
+void proto_register_pnrp(void);
+void proto_reg_handoff_pnrp(void);
+
 /* Define all helper methods  */
 static void dissect_pnrp_ids(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree);
 static void dissect_ipv6_address(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree);
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index 46c7f7febf..f4fcdb94b8 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -40,6 +40,9 @@
 #include <epan/wmem/wmem.h>
 #include "packet-ssl.h"
 
+void proto_register_pop(void);
+void proto_reg_handoff_pop(void);
+
 static int proto_pop = -1;
 
 static int hf_pop_response = -1;
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index 7b54de4102..debd9500a6 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -39,6 +39,8 @@
  *
  *	RFC 1833, "Binding Protocols for ONC RPC Version 2".
  */
+void proto_register_portmap(void);
+void proto_reg_handoff_portmap(void);
 
 static int proto_portmap = -1;
 static int hf_portmap_procedure_v1 = -1;
diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c
index 2ed6b06b02..868aee326b 100644
--- a/epan/dissectors/packet-ppcap.c
+++ b/epan/dissectors/packet-ppcap.c
@@ -33,6 +33,8 @@
 
 #define INVALID_SSN	0xff
 
+void proto_register_ppcap(void);
+
 static guint8 ssn;
 
 static dissector_handle_t ppcap_handle;
diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c
index 23c2d56048..f8fe316ead 100644
--- a/epan/dissectors/packet-ppi-antenna.c
+++ b/epan/dissectors/packet-ppi-antenna.c
@@ -50,6 +50,7 @@ enum ppi_antenna_type {
 };
 #define PPI_ANTENNA_MAXTAGLEN  187 /* increase as fields are added */
 
+void proto_register_ppi_antenna(void);
 
 /* protocol */
 static int proto_ppi_antenna = -1;
diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c
index a161b619c2..b8b1c53a24 100644
--- a/epan/dissectors/packet-ppi-gps.c
+++ b/epan/dissectors/packet-ppi-gps.c
@@ -67,6 +67,8 @@ enum ppi_geotagging_type {
 #define PPI_GPS_MASK_EXT            0x80000000
 
 
+void proto_register_ppi_gps(void);
+
 /* protocol */
 static int proto_ppi_gps = -1;
 
diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c
index c40357baee..d6e21bd234 100644
--- a/epan/dissectors/packet-ppi-sensor.c
+++ b/epan/dissectors/packet-ppi-sensor.c
@@ -92,6 +92,7 @@ static const value_string sensor_unit_str[] = {
   { 0, NULL}
   };
 
+void proto_register_ppi_sensor(void);
 /* protocol */
 static int proto_ppi_sensor = -1;
 
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index 7835ac2dce..b70d8d2f2c 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -149,6 +149,7 @@ static const value_string relativeto_string[] = {
     { 0x00, NULL}
 };
 
+void proto_register_ppi_vector(void);
 
 /* protocol */
 static int proto_ppi_vector = -1;
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index efc834eec6..efbd1ec261 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -165,6 +165,9 @@
         (IEEE80211_CHAN_PUREG | IEEE80211_CHAN_TURBO)
 /* XXX - End - Copied from packet-radiotap.c */
 
+void proto_register_ppi(void);
+void proto_reg_handoff_ppi(void);
+
 typedef enum {
     /* 0 - 29999: Public types */
     PPI_80211_COMMON          =  2,
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 3f3be3c0b2..1469281b4d 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -51,6 +51,51 @@
 #include "packet-usb.h"
 #include "packet-sll.h"
 
+void proto_register_ppp_raw_hdlc(void);
+void proto_reg_handoff_ppp_raw_hdlc(void);
+void proto_register_ppp(void);
+void proto_reg_handoff_ppp(void);
+void proto_register_mp(void);
+void proto_reg_handoff_mp(void);
+void proto_register_lcp(void);
+void proto_reg_handoff_lcp(void);
+void proto_register_vsncp(void);
+void proto_reg_handoff_vsncp(void);
+void proto_register_vsnp(void);
+void proto_reg_handoff_vsnp(void);
+void proto_register_ipcp(void);
+void proto_reg_handoff_ipcp(void);
+void proto_register_bcp(void);
+void proto_register_osinlcp(void);
+void proto_reg_handoff_bcp(void);
+void proto_reg_handoff_osinlcp(void);
+void proto_register_ccp(void);
+void proto_reg_handoff_ccp(void);
+void proto_register_cbcp(void);
+void proto_reg_handoff_cbcp(void);
+void proto_register_bacp(void);
+void proto_reg_handoff_bacp(void);
+void proto_register_bap(void);
+void proto_reg_handoff_bap(void);
+void proto_register_comp_data(void);
+void proto_reg_handoff_comp_data(void);
+void proto_register_pap(void);
+void proto_reg_handoff_pap(void);
+void proto_register_chap(void);
+void proto_reg_handoff_chap(void);
+void proto_register_pppmuxcp(void);
+void proto_reg_handoff_pppmuxcp(void);
+void proto_register_pppmux(void);
+void proto_reg_handoff_pppmux(void);
+void proto_register_mplscp(void);
+void proto_reg_handoff_mplscp(void);
+void proto_register_cdpcp(void);
+void proto_reg_handoff_cdpcp(void);
+void proto_register_ipv6cp(void);
+void proto_reg_handoff_ipv6cp(void);
+void proto_register_iphc_crtp(void);
+void proto_reg_handoff_iphc_crtp(void);
+
 
 static int proto_ppp = -1;
 static int hf_ppp_direction = -1;
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index ce277ba05f..84cf8a3add 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -33,6 +33,12 @@
 #include <epan/expert.h>
 #include <epan/ppptypes.h>
 
+void proto_register_pppoed(void);
+void proto_reg_handoff_pppoed(void);
+void proto_register_pppoes(void);
+void proto_register_pppoe(void);
+void proto_reg_handoff_pppoes(void);
+
 static int proto_pppoed = -1;
 
 /* Common to session and discovery protocols */
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c
index 606eb4833e..efa2b1ee0c 100644
--- a/epan/dissectors/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
@@ -32,6 +32,9 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
+void proto_register_pptp(void);
+void proto_reg_handoff_pptp(void);
+
 static int proto_pptp = -1;
 static int hf_pptp_length = -1;
 static int hf_pptp_message_type = -1;
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c
index 84e5c99c3e..efeb2e6ce6 100644
--- a/epan/dissectors/packet-prp.c
+++ b/epan/dissectors/packet-prp.c
@@ -45,7 +45,9 @@ static const value_string prp_lan_vals[] = {
 /* Initialize the protocol and registered fields      */
 /**********************************************************/
 
+void proto_register_prp(void);
 void proto_reg_handoff_prp(void);
+
 static int proto_prp = -1;
 
 
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index 5d1c1358c9..29b840f128 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -62,6 +62,8 @@
 #define GENERAL_PORT_PTP    320
 
 /* END Port definition's for PTP */
+void proto_register_ptp(void);
+void proto_reg_handoff_ptp(void);
 
 static int proto_ptp = -1;
 
diff --git a/epan/dissectors/packet-pulse.c b/epan/dissectors/packet-pulse.c
index b4dd55275f..b5c16a0499 100644
--- a/epan/dissectors/packet-pulse.c
+++ b/epan/dissectors/packet-pulse.c
@@ -38,6 +38,7 @@
 
 static guint  pulse_port = PORT_PULSE;
 
+void proto_register_pulse(void);
 void proto_reg_handoff_pulse(void);
 
 static int  proto_pulse    = -1;
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 6c135274dc..2b3628c8fa 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -56,6 +56,7 @@
 static gboolean pvfs_desegment = TRUE;
 
 /* Forward declaration we need below */
+void proto_register_pvfs(void);
 void proto_reg_handoff_pvfs(void);
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index 89329f06ac..339533d07a 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -49,6 +49,9 @@
 #include "packet-pw-atm.h"
 #include "packet-pw-common.h"
 
+void proto_register_pw_atm(void);
+void proto_reg_handoff_pw_atm(void);
+
 static gint proto_n1_nocw = -1;
 static gint proto_n1_cw = -1;
 static gint proto_11_or_aal5_pdu = -1;
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index 49a5d3a4c2..fda3463e0c 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -42,6 +42,9 @@
 #include "packet-mpls.h"
 #include "packet-pw-common.h"
 
+void proto_register_pw_cesopsn(void);
+void proto_reg_handoff_pw_cesopsn(void);
+
 static gint proto = -1;
 static gint ett = -1;
 
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c
index 7189d0bf45..6a60615d8e 100644
--- a/epan/dissectors/packet-pw-common.c
+++ b/epan/dissectors/packet-pw-common.c
@@ -28,6 +28,9 @@
 #include <epan/packet.h>
 #include "packet-pw-common.h"
 
+void proto_register_pw_common(void);
+void proto_reg_handoff_pw_common(void);
+
 static const char string_ok[] = "Ok";
 
 const value_string
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index 87906b22f9..b424dc1062 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -35,6 +35,9 @@
 
 #include "packet-mpls.h"
 
+void proto_register_pw_eth(void);
+void proto_reg_handoff_pw_eth(void);
+
 static gint proto_pw_eth_cw = -1;
 static gint proto_pw_eth_nocw = -1;
 static gint proto_pw_eth_heuristic = -1;
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c
index bfcf013a9c..9f98989dc0 100644
--- a/epan/dissectors/packet-pw-fr.c
+++ b/epan/dissectors/packet-pw-fr.c
@@ -39,6 +39,9 @@
 
 #include "packet-mpls.h"
 
+void proto_register_pw_fr(void);
+void proto_reg_handoff_pw_fr(void);
+
 static gint proto_encaps = -1;
 static gint ett_encaps = -1;
 
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index 3d84b8eaa4..d695d10c22 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -42,6 +42,9 @@
 
 #include "packet-mpls.h"
 
+void proto_register_pw_hdlc(void);
+void proto_reg_handoff_pw_hdlc(void);
+
 static dissector_handle_t ppp_handle;
 static dissector_handle_t fr_handle;
 
diff --git a/epan/dissectors/packet-pw-oam.c b/epan/dissectors/packet-pw-oam.c
index 20fff938a4..3d2270c511 100644
--- a/epan/dissectors/packet-pw-oam.c
+++ b/epan/dissectors/packet-pw-oam.c
@@ -30,6 +30,9 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_pw_oam(void);
+void proto_reg_handoff_pw_oam(void);
+
 /* MPLS-TP FM protocol specific variables */
 static gint proto_pw_oam             = -1;
 static gint ett_pw_oam               = -1;
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 1c9367b6c7..3f7b6c7e3f 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -41,6 +41,9 @@
 #include "packet-mpls.h"
 #include "packet-pw-common.h"
 
+void proto_register_pw_satop(void);
+void proto_reg_handoff_pw_satop(void);
+
 static gint proto = -1;
 static gint ett = -1;
 
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index cc4bab79c3..ec19b58735 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -43,6 +43,8 @@
  * ATM code, and from Q.2931 (and Q.931) itself.
  */
 
+void proto_register_q2931(void);
+
 static int proto_q2931 = -1;
 static int hf_q2931_discriminator = -1;
 static int hf_q2931_call_ref_len = -1;
diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c
index 409bc5cab0..e6347190ea 100644
--- a/epan/dissectors/packet-q708.c
+++ b/epan/dissectors/packet-q708.c
@@ -30,6 +30,8 @@
 
 #include "packet-q708.h"
 
+void proto_register_q708(void);
+
 static int proto_q708 = -1;
 static int hf_q708_sanc = -1;
 static int hf_q708_ispc_name = -1;
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 77ca32ab80..b13f9863cc 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -55,6 +55,10 @@
  * http://www.andrews-arnold.co.uk/isdn/q931cause.html
  * http://www.tulatelecom.ru/staff/german/DSSHelp/MessList/InfEl/InfElList.html
  */
+
+void proto_register_q931(void);
+void proto_reg_handoff_q931(void);
+
 static void reset_q931_packet_info(q931_packet_info *pi);
 static gboolean have_valid_q931_pi=FALSE;
 static q931_packet_info *q931_pi=NULL;
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index 5e3f1ebe84..baf78ffb47 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -30,6 +30,9 @@
 #include <epan/strutil.h>
 #include <epan/nlpid.h>
 
+void proto_register_q933(void);
+void proto_reg_handoff_q933(void);
+
 static int proto_q933 					= -1;
 static int hf_q933_discriminator			= -1;
 static int hf_q933_coding_standard			= -1;
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index 4bf30e980f..f45e9a9820 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -28,6 +28,9 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_qllc(void);
+void proto_reg_handoff_qllc(void);
+
 static int proto_qllc = -1;
 static int hf_qllc_address = -1;
 static int hf_qllc_control = -1;
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c
index 6c368fdeaf..a812199901 100644
--- a/epan/dissectors/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
@@ -34,6 +34,8 @@
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 
+void proto_register_quake(void);
+
 static int proto_quake = -1;
 static int hf_quake_header_flags = -1;
 static int hf_quake_header_flags_data = -1;
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 829cb5a877..3c32fb0fd8 100644
--- a/epan/dissectors/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
@@ -36,6 +36,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+void proto_register_quake2(void);
+
 static int proto_quake2 = -1;
 
 static int hf_quake2_s2c = -1;
diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index 598e24d2fc..8ba19abad6 100644
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -45,6 +45,7 @@
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 
+void proto_register_quake3(void);
 static int proto_quake3 = -1;
 
 static int hf_quake3_direction = -1;
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index 377cbaa5d9..7fafe73a15 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -38,6 +38,8 @@
 #include <epan/strutil.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_quakeworld(void);
+
 static int proto_quakeworld = -1;
 
 static int hf_quakeworld_s2c = -1;
diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c
index 485e916130..7ef1d2dccf 100644
--- a/epan/dissectors/packet-quic.c
+++ b/epan/dissectors/packet-quic.c
@@ -36,6 +36,7 @@ QUIC source code in Chromium : https://code.google.com/p/chromium/codesearch#chr
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+void proto_register_quic(void);
 void proto_reg_handoff_quic(void);
 
 static int proto_quic = -1;
diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c
index 756a723af9..606d23a6d9 100644
--- a/epan/dissectors/packet-radius_packetcable.c
+++ b/epan/dissectors/packet-radius_packetcable.c
@@ -49,7 +49,8 @@
 
 #include "packet-radius.h"
 
-
+void proto_register_packetcable(void);
+void proto_reg_handoff_packetcable(void);
 
 static int proto_packetcable = -1;
 
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index 48a0cf694d..a46e48419e 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -34,6 +34,9 @@
 
 #include "packet-ip.h"
 
+void proto_register_redback(void);
+void proto_reg_handoff_redback(void);
+
 static dissector_handle_t redback_handle;
 
 static gint ett_redback = -1;