- Make local functions static.

- Forward declaration of register functions.

svn path=/trunk/; revision=53942

17 files changed, 47 insertions, 6 deletions

diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c
index b5a1d5e0d9..6d61811ed4 100644
--- a/epan/dissectors/packet-sasp.c
+++ b/epan/dissectors/packet-sasp.c
@@ -33,6 +33,9 @@
 #include <epan/prefs.h>
 
 /* forward reference */
+void proto_register_sasp(void);
+void proto_reg_handoff_sasp(void);
+
 static void dissect_reg_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset);
 static void dissect_dereg_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset);
 static void dissect_reg_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset);
diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c
index 091d099f65..348f15feb3 100644
--- a/epan/dissectors/packet-sbc.c
+++ b/epan/dissectors/packet-sbc.c
@@ -38,6 +38,8 @@
 #define FREQUENCY_44100        0x02
 #define FREQUENCY_48000        0x03
 
+void proto_register_sbc(void);
+
 static int proto_sbc = -1;
 
 static int hf_sbc_fragmented                                               = -1;
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index 26b2092709..d7ac2ed550 100644
--- a/epan/dissectors/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
@@ -54,6 +54,9 @@
 #define SCCPMG_MESSAGE_TYPE_SNR 0xfe
 #define SCCPMG_MESSAGE_TYPE_SRT 0xff
 
+void proto_register_sccpmg(void);
+void proto_reg_handoff_sccpmg(void);
+
 /* Same as below but with names typed out */
 static const value_string sccpmg_message_type_values[] = {
   { SCCPMG_MESSAGE_TYPE_SSA,   "SubSystem Allowed" },
diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c
index 589e76c569..2891445cbb 100644
--- a/epan/dissectors/packet-scop.c
+++ b/epan/dissectors/packet-scop.c
@@ -33,6 +33,8 @@
 #define SCOP_DEFAULT_PORT           17755
 #define SCOP_DEFAULT_PORT_SECURED   17756
 
+void proto_register_scop(void);
+
 /* Structure to contain information from the SCoP packet. */
 typedef struct {
     guint8      transport;
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index 4340a1c439..db414edffb 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.c
@@ -34,6 +34,8 @@
 
 #define SSPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097604
 
+void proto_register_ssprotocol(void);
+void proto_reg_handoff_ssprotocol(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_ssprotocol     = -1;
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index b03b9235d0..119afb35da 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -35,6 +35,7 @@
 #include "packet-scsi-mmc.h"
 #include "packet-scsi-sbc.h"
 
+void proto_register_scsi_mmc(void);
 
 static int proto_scsi_mmc = -1;
 int hf_scsi_mmc_opcode = -1;
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 26cab1b1af..e0cb1f7998 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -38,6 +38,8 @@
 #include "packet-fc.h"
 #include "packet-scsi-osd.h"
 
+void proto_register_scsi_osd(void);
+void proto_reg_handoff_scsi_osd(void);
 
 static int proto_scsi_osd                               = -1;
 int hf_scsi_osd_opcode                                  = -1;
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index 221cd057a5..22c3958082 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -46,6 +46,8 @@
 #include "packet-fc.h"
 #include "packet-scsi-sbc.h"
 
+void proto_register_scsi_sbc(void);
+void proto_reg_handoff_scsi_sbc(void);
 
 static int proto_scsi_sbc = -1;
 
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c
index f070f461d6..4cc362293e 100644
--- a/epan/dissectors/packet-scsi-smc.c
+++ b/epan/dissectors/packet-scsi-smc.c
@@ -37,6 +37,8 @@
 #include "packet-fc.h"
 #include "packet-scsi-smc.h"
 
+void proto_register_scsi_smc(void);
+void proto_reg_handoff_scsi_smc(void);
 
 static int proto_scsi_smc			= -1;
 int hf_scsi_smc_opcode				= -1;
@@ -101,7 +103,7 @@ static gint ett_scsi_exchange_medium		= -1;
 static gint ett_scsi_range			= -1;
 static gint ett_scsi_move			= -1;
 
-void
+static void
 dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                     guint offset, gboolean isreq, gboolean iscdb,
                     guint payload_len _U_, scsi_task_data_t *cdata _U_)
@@ -127,7 +129,7 @@ dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
     }
 }
 
-void
+static void
 dissect_smc_position_to_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                     guint offset, gboolean isreq, gboolean iscdb,
                     guint payload_len _U_, scsi_task_data_t *cdata _U_)
@@ -150,7 +152,7 @@ dissect_smc_position_to_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
     }
 }
 
-void
+static void
 dissect_smc_initialize_element_status (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                     guint offset, gboolean isreq, gboolean iscdb,
                     guint payload_len _U_, scsi_task_data_t *cdata _U_)
@@ -164,7 +166,7 @@ dissect_smc_initialize_element_status (tvbuff_t *tvb, packet_info *pinfo _U_, pr
     }
 }
 
-void
+static void
 dissect_smc_initialize_element_status_with_range (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                     guint offset, gboolean isreq, gboolean iscdb,
                     guint payload_len _U_, scsi_task_data_t *cdata _U_)
@@ -188,7 +190,7 @@ dissect_smc_initialize_element_status_with_range (tvbuff_t *tvb, packet_info *pi
     }
 }
 
-void
+static void
 dissect_smc_openclose_importexport_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                     guint offset, gboolean isreq, gboolean iscdb,
                     guint payload_len _U_, scsi_task_data_t *cdata _U_)
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index 75c7d36f0a..4d84cef7ef 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -42,6 +42,8 @@
 #include "packet-scsi-ssc.h"
 #include "packet-scsi-smc.h"
 
+void proto_register_scsi_ssc(void);
+void proto_reg_handoff_scsi_ssc(void);
 
 static int proto_scsi_ssc		= -1;
 int hf_scsi_ssc_opcode			= -1;
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index ef9b491d1e..ad8b0c19dd 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -98,6 +98,9 @@
 #include "packet-scsi-ssc.h"
 #include "packet-scsi-smc.h"
 
+void proto_register_scsi(void);
+void proto_reg_handoff_scsi(void);
+
 static int proto_scsi                           = -1;
 static int hf_scsi_inq_control_vendor_specific  = -1;
 static int hf_scsi_inq_control_reserved         = -1;
@@ -4945,7 +4948,7 @@ dissect_scsi_descriptor_snsinfo(tvbuff_t *tvb, proto_tree *sns_tree, guint offse
     }
 }
 
-void
+static void
 dissect_scsi_sense(tvbuff_t *tvb, proto_tree *sns_tree, guint offset)
 {
     guint8 sense_type;
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 00a22eb796..edfa689660 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -81,6 +81,9 @@
 /** This is a valid PPID, but we use it to mark the end of the list */
 #define LAST_PPID 0xffffffff
 
+void proto_register_sctp(void);
+void proto_reg_handoff_sctp(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_sctp = -1;
 static int hf_port = -1;
diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c
index 4cbd6d5478..fd3990fca2 100644
--- a/epan/dissectors/packet-sdh.c
+++ b/epan/dissectors/packet-sdh.c
@@ -34,6 +34,9 @@
 #define COLUMNS 270
 #define EXT_HDR_TYPE_RAW_LINK        5
 
+void proto_register_sdh(void);
+void proto_reg_handoff_sdh(void);
+
 static int proto_sdh = -1;
 
 static gint ett_sdh = -1;
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index eb7fa85074..32bc4e0c21 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -35,6 +35,8 @@
  *
  *	http://www.protocols.com/pbook/sna.htm
  */
+void proto_register_sdlc(void);
+void proto_reg_handoff_sdlc(void);
 
 static int proto_sdlc = -1;
 static int hf_sdlc_address = -1;
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 25666a4ae4..541de456fd 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -75,6 +75,9 @@
 #include "packet-h264.h"
 #include "packet-mp4ves.h"
 
+void proto_register_sdp(void);
+void proto_reg_handoff_sdp(void);
+
 static dissector_handle_t rtcp_handle;
 static dissector_handle_t sprt_handle;
 static dissector_handle_t msrp_handle;
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index 27efea0da4..43f070df17 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -86,6 +86,9 @@
 /* By default, but can be completely different */
 #define UDP_PORT_SEBEK	1101
 
+void proto_register_sebek(void);
+void proto_reg_handoff_sebek(void);
+
 static int proto_sebek = -1;
 
 static int hf_sebek_magic = -1;
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c
index 6c4ec41ce5..92a7fa96ab 100644
--- a/epan/dissectors/packet-selfm.c
+++ b/epan/dissectors/packet-selfm.c
@@ -67,6 +67,9 @@
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_selfm(void);
+void proto_reg_handoff_selfm(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_selfm                        = -1;
 static int hf_selfm_msgtype                   = -1;