- Make local functions static.

- Forward declaration of register functions.

svn path=/trunk/; revision=53958

32 files changed, 87 insertions, 5 deletions

diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index 5b258ea435..c1e8882e95 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -55,6 +55,8 @@
 #define LCT_CLOSE_SESSION_FLAG 0x0002
 #define LCT_CLOSE_OBJECT_FLAG 0x0001
 
+void proto_register_rmt_lct(void);
+
 static int proto_rmt_lct = -1;
 
 static int hf_version = -1;
diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c
index c74a48a854..b5d0b553ce 100644
--- a/epan/dissectors/packet-rmt-norm.c
+++ b/epan/dissectors/packet-rmt-norm.c
@@ -51,6 +51,9 @@
 
 #include "packet-rmt-common.h"
 
+void proto_register_rmt_norm(void);
+void proto_reg_handoff_rmt_norm(void);
+
 /* String tables */
 
 #define NORM_INFO       1
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index 79e11e8b30..d109dfc0f6 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -44,6 +44,8 @@
 
 #include "packet-rohc.h"
 
+void proto_register_rohc(void);
+void proto_reg_handoff_rohc(void);
 
 static GHashTable *rohc_cid_hash = NULL;
 
diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c
index 76924febd7..0a35fcbff0 100644
--- a/epan/dissectors/packet-roofnet.c
+++ b/epan/dissectors/packet-roofnet.c
@@ -76,6 +76,7 @@ static const value_string roofnet_flags_vals[] = {
 #define ROOFNET_LINK_LEN 24
 
 /* forward reference */
+void proto_register_roofnet(void);
 void proto_reg_handoff_roofnet(void);
 
 static dissector_handle_t ip_handle;
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index f2ad3ca325..8100629fa8 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -68,6 +68,8 @@
  *	protocols (ab)use AUTH_RSA for their own AUTH-flavor. AUTH_RSA is
  *	therefore dissected as the inofficial AUTH_GLUSTER.
  */
+void proto_register_rpc(void);
+void proto_reg_handoff_rpc(void);
 
 /* desegmentation of RPC over TCP */
 static gboolean rpc_desegment = TRUE;
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 98e977234c..a0823078f1 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -106,6 +106,7 @@
 #define FLAG_INBOUND     0x0008
 #define FLAG_OUTBOUND    0x0010
 
+void proto_register_rpcap (void);
 void proto_reg_handoff_rpcap (void);
 
 static int proto_rpcap = -1;
diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c
index fd57c58d16..82592d732a 100644
--- a/epan/dissectors/packet-rpki-rtr.c
+++ b/epan/dissectors/packet-rpki-rtr.c
@@ -34,6 +34,7 @@
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 
+void proto_register_rpkirtr(void);
 void proto_reg_handoff_rpkirtr(void);
 
 static int proto_rpkirtr = -1;
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index ba2cda1c00..09d5a41833 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -31,6 +31,9 @@
 #include <epan/llcsaps.h>
 #include "packet-llc.h"
 
+void proto_register_rpl(void);
+void proto_reg_handoff_rpl(void);
+
 static int proto_rpl          = -1;
 
 static int hf_rpl_type        = -1;
diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c
index 1808f72771..0e5d63f0a0 100644
--- a/epan/dissectors/packet-rquota.c
+++ b/epan/dissectors/packet-rquota.c
@@ -32,6 +32,9 @@
 #include "packet-rpc.h"
 #include "packet-rquota.h"
 
+void proto_register_rquota(void);
+void proto_reg_handoff_rquota(void);
+
 static int proto_rquota = -1;
 static int hf_rquota_procedure_v1 = -1;
 static int hf_rquota_procedure_v2 = -1;
diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c
index 78c6cc5219..1ecda0a64d 100644
--- a/epan/dissectors/packet-rsh.c
+++ b/epan/dissectors/packet-rsh.c
@@ -43,6 +43,9 @@
 /* The rsh protocol uses TCP port 512 per its IANA assignment */
 #define RSH_PORT 514
 
+void proto_register_rsh(void);
+void proto_reg_handoff_rsh(void);
+
 /* Variables for our preferences */
 static gboolean preference_info_show_client_username = FALSE;
 static gboolean preference_info_show_server_username = TRUE;
diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c
index a468bc1dec..6945b056de 100644
--- a/epan/dissectors/packet-rsip.c
+++ b/epan/dissectors/packet-rsip.c
@@ -33,6 +33,8 @@
 #include <epan/to_str.h>
 #include <epan/ipproto.h>
 
+void proto_register_rsip(void);
+
 /* Forward declaration we need below */
 void proto_reg_handoff_rsip(void);
 
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index dc162e389e..527d3e45f4 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -42,6 +42,9 @@
 #include "packet-rtp.h"
 #include "packet-rtcp.h"
 
+void proto_register_rsl(void);
+void proto_reg_handoff_rsl(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_rsl        = -1;
 
diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c
index b7003174f4..d5351db83f 100644
--- a/epan/dissectors/packet-rstat.c
+++ b/epan/dissectors/packet-rstat.c
@@ -30,6 +30,9 @@
 
 #include "packet-rpc.h"
 
+void proto_register_rstat(void);
+void proto_reg_handoff_rstat(void);
+
 static int proto_rstat = -1;
 static int hf_rstat_procedure_v1 = -1;
 static int hf_rstat_procedure_v2 = -1;
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 7195d242af..c0aba791bd 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -38,6 +38,8 @@
 #include <epan/wmem/wmem.h>
 #include <epan/prefs.h>
 
+void proto_register_rsync(void);
+
 #define RSYNCD_MAGIC_HEADER "@RSYNCD:"
 #define RSYNCD_MAGIC_HEADER_LEN 8
 
diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c
index f2d75a6d92..248c2c7102 100644
--- a/epan/dissectors/packet-rtacser.c
+++ b/epan/dissectors/packet-rtacser.c
@@ -65,6 +65,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+void proto_register_rtacser(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_rtacser                    = -1;
 static int hf_rtacser_timestamp             = -1;
diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c
index 26debe844e..c28602cd9b 100644
--- a/epan/dissectors/packet-rtcdc.c
+++ b/epan/dissectors/packet-rtcdc.c
@@ -40,6 +40,7 @@
 #include <epan/prefs.h>
 #include <epan/sctpppids.h>
 
+void proto_register_rtcdc(void);
 void proto_reg_handoff_rtcdc(void);
 
 /* PPID used for this protocol */
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index d8e3b8aded..178f5faf6d 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -79,6 +79,9 @@
 #include <epan/strutil.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_rtcp(void);
+void proto_reg_handoff_rtcp(void);
+
 /* Version is the first 2 bits of the first octet*/
 #define RTCP_VERSION(octet) ((octet) >> 6)
 
@@ -734,7 +737,7 @@ dissect_rtcp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
 
 /* Dissect the length field. Append to this field text indicating the number of
    actual bytes this translates to (i.e. (raw value + 1) * 4) */
-int dissect_rtcp_length_field( proto_tree *tree, tvbuff_t *tvb, int offset)
+static int dissect_rtcp_length_field( proto_tree *tree, tvbuff_t *tvb, int offset)
 {
     proto_item     *ti;
     unsigned short  raw_length = tvb_get_ntohs( tvb, offset );
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 2dcd337922..c68daa1690 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -79,6 +79,11 @@
 
 /* #define DEBUG_RTMPT 1 */
 
+void proto_register_rtmpt(void);
+void proto_reg_handoff_rtmpt(void);
+
+void proto_register_amf(void);
+
 static int proto_rtmpt = -1;
 
 static int hf_rtmpt_handshake_c0 = -1;
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 34089d8dfd..905fca3c8b 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -44,6 +44,12 @@
  *        http://www.rts.uni-hannover.de/rtnet/lxr/source/Documentation/RTmac.spec
  */
 
+void proto_register_rtmac(void);
+void proto_reg_handoff_rtmac(void);
+
+void proto_register_rtcfg(void);
+void proto_reg_handoff_rtcfg(void);
+
 #define RTMAC_TYPE_TDMA     0x0001 /* since version 2    */
 #define RTMAC_TYPE_TDMA_V1  0x9031 /* first TDMA version */
 
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 5944a9f547..6b3e845ec1 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -45,6 +45,8 @@
 #include "packet-rtp.h"
 #include <epan/tap.h>
 
+void proto_register_rtp_event(void);
+
 /*  rtp_event_payload_type_value is the value used globally
 	to set the appropriate payload type
 */
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
index 872ffadf92..5e89a5f2c5 100644
--- a/epan/dissectors/packet-rtpproxy.c
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -55,6 +55,9 @@
 #include "packet-rtp.h"
 #include "packet-rtcp.h"
 
+void proto_register_rtpproxy(void);
+void proto_reg_handoff_rtpproxy(void);
+
 static int proto_rtpproxy = -1;
 
 static int hf_rtpproxy_cookie = -1;
@@ -266,7 +269,7 @@ static nstime_t rtpproxy_timeout_ns = {1, 0};
 
 void proto_reg_handoff_rtpproxy(void);
 
-gint
+static gint
 rtpproxy_add_tag(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint realsize)
 {
 	proto_item *ti = NULL;
@@ -300,7 +303,7 @@ rtpproxy_add_tag(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint re
 	return (end == realsize ? -1 : (gint)end);
 }
 
-void
+static void
 rtpproxy_add_parameter(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint realsize)
 {
 	proto_item *ti;
@@ -397,7 +400,7 @@ rtpproxy_add_parameter(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, gu
 	}
 }
 
-rtpproxy_info_t *
+static rtpproxy_info_t *
 rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_tree, rtpproxy_conv_info_t *rtpproxy_conv, gchar* cookie)
 {
 	rtpproxy_info_t *rtpproxy_info;
@@ -439,7 +442,7 @@ rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_t
 	return rtpproxy_info;
 }
 
-void
+static void
 rtpproxy_add_notify_addr(proto_tree *rtpproxy_tree, tvbuff_t *tvb, guint begin, guint end)
 {
 	gint offset = 0;
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index f4bffeeb4b..f3998f29e2 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -61,6 +61,9 @@
 
 #include "packet-rtps.h"
 
+void proto_register_rtps(void);
+void proto_reg_handoff_rtps(void);
+
 static const char * const SM_EXTRA_RPLUS  = "(r+)";
 static const char * const SM_EXTRA_RMINUS = "(r-)";
 static const char * const SM_EXTRA_WPLUS  = "(w+)";
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index 03afbef167..46420339a7 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -54,6 +54,8 @@
 #include "packet-e164.h"
 #include "packet-rtsp.h"
 
+void proto_register_rtsp(void);
+
 static int rtsp_tap = -1;
 static rtsp_info_value_t *rtsp_stat_info;
 
diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c
index e623652229..b071594c2b 100644
--- a/epan/dissectors/packet-rudp.c
+++ b/epan/dissectors/packet-rudp.c
@@ -48,6 +48,9 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+
+void proto_register_rudp(void);
+
 /* Disable rudp by default. The previously hardcoded value of
  * 7000 (used by Cisco) collides with afs and as the draft states:
  * "RUDP doesn't place any restrictions on which UDP port numbers are used.
diff --git a/epan/dissectors/packet-rwall.c b/epan/dissectors/packet-rwall.c
index a26c7619fa..b9c16c188c 100644
--- a/epan/dissectors/packet-rwall.c
+++ b/epan/dissectors/packet-rwall.c
@@ -28,6 +28,9 @@
 #include "packet-rpc.h"
 #include "packet-rwall.h"
 
+void proto_register_rwall(void);
+void proto_reg_handoff_rwall(void);
+
 static header_field_info *hfi_rwall = NULL;
 
 #define RWALL_HFI_INIT HFI_INIT(proto_rwall)
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c
index a9644fd168..d9c3ff806c 100644
--- a/epan/dissectors/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
@@ -42,6 +42,8 @@
  * XXX - is the "Epoch" really a UN*X time?  The high-order bit, according
  * to that spec, is a flag bit.
  */
+void proto_register_rx(void);
+void proto_reg_handoff_rx(void);
 
 #define UDP_PORT_RX_LOW		7000
 #define UDP_PORT_RX_HIGH	7009
diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c
index 2469c9d83c..02c51a937c 100644
--- a/epan/dissectors/packet-s5066dts.c
+++ b/epan/dissectors/packet-s5066dts.c
@@ -68,6 +68,8 @@
 #define S5066_EOW_HDR_DRC_REQUEST           7
 #define S5066_EOW_HFTRP_TOKEN               15
 
+void proto_register_s5066dts(void);
+
 static gint proto_s5066dts = -1;
 
 /* Configuration parameters */
diff --git a/epan/dissectors/packet-s5066sis.c b/epan/dissectors/packet-s5066sis.c
index 352f116d06..b2bccaa784 100644
--- a/epan/dissectors/packet-s5066sis.c
+++ b/epan/dissectors/packet-s5066sis.c
@@ -34,6 +34,7 @@
 
 /* Forward reference */
 /* Register functions */
+void proto_register_s5066(void);
 void proto_reg_handoff_s5066(void);
 /* Main dissectors */
 static int dissect_s5066_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
diff --git a/epan/dissectors/packet-sadmind.c b/epan/dissectors/packet-sadmind.c
index 759440ec55..884f693607 100644
--- a/epan/dissectors/packet-sadmind.c
+++ b/epan/dissectors/packet-sadmind.c
@@ -30,6 +30,9 @@
 
 #include "packet-rpc.h"
 
+void proto_register_sadmind(void);
+void proto_reg_handoff_sadmind(void);
+
 static int proto_sadmind = -1;
 static int hf_sadmind_procedure_v1 = -1;
 static int hf_sadmind_procedure_v2 = -1;
diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c
index dba4821a0e..4b83abfe78 100644
--- a/epan/dissectors/packet-sametime.c
+++ b/epan/dissectors/packet-sametime.c
@@ -34,6 +34,9 @@
 
 #define DEFAULT_SAMETIME_PORT	1533
 
+void proto_register_sametime(void);
+void proto_reg_handoff_sametime(void);
+
 static int proto_sametime = -1;
 static guint global_sametime_port = DEFAULT_SAMETIME_PORT;
 static dissector_handle_t sametime_handle;
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index 922f9ce961..44b6f500bc 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -39,6 +39,10 @@
 #define MCAST_SAP_VERSION_SHIFT 5   /* Right shift 5 bits to get the version */
 #define MCAST_SAP_VER0 0            /* Version 0 */
 #define MCAST_SAP_VER1PLUS 1        /* Version 1 or later */
+
+void proto_register_sap(void);
+void proto_reg_handoff_sap(void);
+
 static const value_string mcast_sap_ver[] = {
     { MCAST_SAP_VER0,     "SAPv0"},
     { MCAST_SAP_VER1PLUS, "SAPv1 or later"},
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index a408d61e6f..14995dddcf 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -31,6 +31,9 @@
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 
+void proto_register_sbus(void);
+void proto_reg_handoff_sbus(void);
+
 /* Attribute values*/
 #define SBUS_REQUEST                   0x00
 #define SBUS_RESPONSE                  0x01