Fix [-Wmissing-prototypes]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54209 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index 1922bf53fa4fd79b40da82f967a6c37f558447ec..490bb1acf3fa28e2485b9b521de30d1744d4f4d2 100644 (file)
--- a/epan/dissectors/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
@@ -34,6 +34,9 @@
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-dce122.h"
 
+void proto_register_dce_update(void);
+void proto_reg_handoff_dce_update(void);
+
 static int proto_dce_update = -1;
 static int hf_dce_update_opnum = -1;
 

diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index cf5613d476e024e8910a0167271f8e01641ac530..05d987090e0d7b5c1d72f52904e130df17ad2203 100644 (file)
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -1143,7 +1143,7 @@ dissect_dcom_ScmReplyInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
     return offset;
 }
 
-void
+static void
 sysact_register_routines(void)
 {
     dcom_register_rountine(dissect_dcom_ActivationProperties, &iid_ActivationPropertiesIn);

diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index 55fbc17fef2430457d36829a06fec9ff8fbf3380..e485ef85e1edf30f51934cfcae61ce33924bc4ab 100644 (file)
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -1987,7 +1987,7 @@ dcom_get_rountine_by_uuid(const e_uuid_t* uuid)
 }
 
 /* dissect an CUSTOM */
-int
+static int
 dissect_dcom_CUSTOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                               proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex,
                               e_uuid_t *clsid, e_uuid_t *iid)

diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index d9149cadfa4bd34e4a9e8ac76538bbb53e011243..9e494f02828e672955a88ebb93c069e8737a1f14 100644 (file)
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -1159,7 +1159,7 @@ dissect_tcpip_status(packet_info *pinfo, proto_tree *tree, proto_item *item, tvb
    return 4;
 }
 
-int
+static int
 dissect_tcpip_config_cap(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
                          int offset, int total_len)
 

diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index 8c08eaa6c79ee0cfa025a5b83f06ac65205be3d4..2e1b3c236bc370e1fb017f6fe8fef70dc29d88e1 100644 (file)
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -2147,7 +2147,7 @@ static const value_string gsm_a_rr_egprs2_vals[] = {
     { 0x02, "The mobile station supports both EGPRS2-A and EGPRS2-B"},
     {    0, NULL }
 };
-guint16
+static guint16
 de_rr_chnl_req_desc2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
 {
     guint32 bit_offset = offset << 3;

diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index 640f2364c2de7e49031e3022b08339c46a36bc29..b0a6b03d4f2f52a605068f97200e2cd516472ccc 100644 (file)
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -1252,7 +1252,7 @@ CSN_DESCR_BEGIN   (EGPRS_AckNack_Desc_t)
 CSN_DESCR_END     (EGPRS_AckNack_Desc_t)
 
 /* < EGPRS Ack/Nack Description IE > */
-gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
+static gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
 {
   return csnStreamDissector(tree, ar, CSNDESCR(EGPRS_AckNack_Desc_t), tvb, data, ett_gsm_rlcmac);
 }
@@ -1867,7 +1867,7 @@ CSN_DESCR_BEGIN(Receive_N_PDU_Number_t)
   M_UINT       (Receive_N_PDU_Number_t,  value,  8, &hf_receive_n_pdu_number_value),
 CSN_DESCR_END  (Receive_N_PDU_Number_t)
 
-gint16 Receive_N_PDU_Number_list_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
+static gint16 Receive_N_PDU_Number_list_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
 {
   return csnStreamDissector(tree, ar, CSNDESCR(Receive_N_PDU_Number_t), tvb, data, ett_gsm_rlcmac);
 }
@@ -1973,7 +1973,7 @@ CSN_DESCR_BEGIN       (Content_t)
   M_UINT_OR_NULL      (Content_t,  PS_HandoverCapability,  1, &hf_content_ps_handovercapability),
 CSN_DESCR_END         (Content_t)
 
-gint16 Content_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
+static gint16 Content_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
 {
   return csnStreamDissector(tree, ar, CSNDESCR(Content_t), tvb, data, ett_gsm_rlcmac);
 }
@@ -1990,7 +1990,7 @@ CSN_DESCR_BEGIN       (Additional_access_technologies_t)
   M_REC_TARRAY        (Additional_access_technologies_t, Additional_access_technologies[0], Additional_access_technologies_struct_t, Count_additional_access_technologies),
 CSN_DESCR_END         (Additional_access_technologies_t)
 
-gint16 Additional_access_technologies_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
+static gint16 Additional_access_technologies_Dissector(proto_tree *tree, csnStream_t* ar, tvbuff_t *tvb, void* data, int ett_csn1 _U_)
 {
   return csnStreamDissector(tree, ar, CSNDESCR(Additional_access_technologies_t), tvb, data, ett_gsm_rlcmac);
 }
@@ -3487,7 +3487,7 @@ CSN_DESCR_BEGIN(Cell_Selection_Params_With_FreqDiff_t)
   M_TYPE       (Cell_Selection_Params_With_FreqDiff_t, Cell_SelectionParams, Cell_Selection_t),
 CSN_DESCR_END  (Cell_Selection_Params_With_FreqDiff_t)
 
-CSN_CallBackStatus_t callback_init_Cell_Selection_Params_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
+static CSN_CallBackStatus_t callback_init_Cell_Selection_Params_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
 {
   guint  i;
   guint8 freq_diff_len = *(guint8*)param1;
@@ -3608,7 +3608,7 @@ static const CSN_DESCR_BEGIN(CellSelectionParamsWithFreqDiff_t)
 CSN_DESCR_END  (CellSelectionParamsWithFreqDiff_t)
 
 
-CSN_CallBackStatus_t callback_init_Cell_Sel_Param_2_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
+static CSN_CallBackStatus_t callback_init_Cell_Sel_Param_2_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
 {
   guint  i;
   guint8 freq_diff_len = *(guint8*)param1;
@@ -3808,7 +3808,7 @@ CSN_DESCR_BEGIN(CDMA2000_Description_t)
 CSN_DESCR_END  (CDMA2000_Description_t)
 
 static const guint8 NR_OF_FDD_CELLS_map[32] = {0, 10, 19, 28, 36, 44, 52, 60, 67, 74, 81, 88, 95, 102, 109, 116, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-CSN_CallBackStatus_t callback_UTRAN_FDD_map_NrOfFrequencies(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
+static CSN_CallBackStatus_t callback_UTRAN_FDD_map_NrOfFrequencies(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
 {   /* TS 44.060 Table 11.2.9b.2.a */
   guint8 *pNrOfCells = (guint8*)param1;
   guint8 *pBitsInCellInfo = (guint8*)param2;
@@ -3825,7 +3825,7 @@ CSN_CallBackStatus_t callback_UTRAN_FDD_map_NrOfFrequencies(proto_tree *tree _U_
   return 0;
 }
 
-CSN_CallBackStatus_t callback_UTRAN_FDD_compute_FDD_CELL_INFORMATION(proto_tree *tree, tvbuff_t *tvb, void* param1, void* param2 _U_, int bit_offset, int ett_csn1)
+static CSN_CallBackStatus_t callback_UTRAN_FDD_compute_FDD_CELL_INFORMATION(proto_tree *tree, tvbuff_t *tvb, void* param1, void* param2 _U_, int bit_offset, int ett_csn1)
 {
   proto_item   *ti;
   proto_tree   *subtree;
@@ -3910,7 +3910,7 @@ CSN_DESCR_END  (UTRAN_FDD_Description_t)
 
 
 static const guint8 NR_OF_TDD_CELLS_map[32] = {0, 9, 17, 25, 32, 39, 46, 53, 59, 65, 71, 77, 83, 89, 95, 101, 106, 111, 116, 121, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-CSN_CallBackStatus_t callback_UTRAN_TDD_map_NrOfFrequencies(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
+static CSN_CallBackStatus_t callback_UTRAN_TDD_map_NrOfFrequencies(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
 {  /* TS 44.060 Table 11.2.9b.2.b */
   guint8 * pNrOfCells = (guint8*)param1;
   guint8 * pBitsInCellInfo = (guint8*)param2;
@@ -3927,7 +3927,7 @@ CSN_CallBackStatus_t callback_UTRAN_TDD_map_NrOfFrequencies(proto_tree *tree _U_
   return 0;
 }
 
-CSN_CallBackStatus_t callback_UTRAN_TDD_compute_TDD_CELL_INFORMATION(proto_tree *tree, tvbuff_t *tvb, void* param1, void* param2 _U_, int bit_offset, int ett_csn1)
+static CSN_CallBackStatus_t callback_UTRAN_TDD_compute_TDD_CELL_INFORMATION(proto_tree *tree, tvbuff_t *tvb, void* param1, void* param2 _U_, int bit_offset, int ett_csn1)
 {
   proto_item   *ti;
   proto_tree   *subtree;
@@ -4149,7 +4149,7 @@ CSN_DESCR_BEGIN(lu_ModeOnlyCellSelectionParamsWithFreqDiff_t)
   M_TYPE       (lu_ModeOnlyCellSelectionParamsWithFreqDiff_t, lu_ModeOnlyCellSelectionParams, lu_ModeOnlyCellSelection_t),
 CSN_DESCR_END  (lu_ModeOnlyCellSelectionParamsWithFreqDiff_t)
 
-CSN_CallBackStatus_t callback_init_luMode_Cell_Sel_Param_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
+static CSN_CallBackStatus_t callback_init_luMode_Cell_Sel_Param_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
 {
   guint  i;
   guint8 freq_diff_len = *(guint8*)param1;
@@ -5764,7 +5764,7 @@ CSN_DESCR_BEGIN(COMPACT_Neighbour_Cell_Param_Remaining_t)
   M_TYPE       (COMPACT_Neighbour_Cell_Param_Remaining_t,  COMPACT_Cell_Sel_Remain_Cells, COMPACT_Cell_Sel_t),
 CSN_DESCR_END  (COMPACT_Neighbour_Cell_Param_Remaining_t)
 
-CSN_CallBackStatus_t callback_init_COMP_Ncell_Param_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
+static CSN_CallBackStatus_t callback_init_COMP_Ncell_Param_FREQUENCY_DIFF(proto_tree *tree _U_, tvbuff_t *tvb _U_, void* param1, void* param2, int bit_offset _U_, int ett_csn1 _U_)
 {
   guint  i;
   guint8 freq_diff_len = *(guint8*)param1;

diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index 33a223c4f5b9dbed26ca6c338aa045fe63932865..f3ccb64262ec69d0aa19db0b34692fb2d38c2f5b 100644 (file)
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -1557,7 +1557,7 @@ g_int64_equal (gconstpointer v1,
 }
 #endif
 
-void table_destroy_notify(gpointer data) {
+static void table_destroy_notify(gpointer data) {
     g_free(data);
 }
 

diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 7b624d791c6a290db7f005d31f8bcb9ed3c71798..9b36e756d8b8feb0baf34377bd8cf4559d3baea9 100644 (file)
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -2020,14 +2020,14 @@ dissect_krb5_cname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 }
 
 
-int
+static int
 dissect_krb5_prealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
     offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_prealm, NULL, 0);
     return offset;
 }
 
-int
+static int
 dissect_krb5_srealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
     offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_srealm, NULL, 0);

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index c2af88a1e1273f6c2aafd2095d0d12c44b2b2eec..ef2e28d957f926f5483ebc9e5daeb865f3fcb561 100644 (file)
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -51,6 +51,7 @@
 #include "packet-llc.h"
 
 void proto_register_basicxid(void);
+void proto_register_llc(void);
 void proto_reg_handoff_llc(void);
 
 #define UDP_PORT_LLC1   12000

diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c
index 84cb9d4b828bdcd0653f17d781db025770391fe9..6de0bf50a73f263c1911b6bb8eb9a4590678a73b 100644 (file)
--- a/epan/dissectors/packet-moldudp.c
+++ b/epan/dissectors/packet-moldudp.c
@@ -64,7 +64,7 @@ static expert_field ei_moldudp_msglen_invalid = EI_INIT;
 static expert_field ei_moldudp_count_invalid = EI_INIT;
 
 /* Code to dissect a message block */
-guint
+static guint
 dissect_moldudp_msgblk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         guint offset, guint32 sequence)
 {

diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c
index e8202b503abce343c9369a10ec23de06816d9e5c..1509202eaafc2d26b3f2e47d0a3bdd7ceecc3700 100644 (file)
--- a/epan/dissectors/packet-moldudp64.c
+++ b/epan/dissectors/packet-moldudp64.c
@@ -67,7 +67,7 @@ static expert_field ei_moldudp64_count_invalid = EI_INIT;
 static expert_field ei_moldudp64_request = EI_INIT;
 
 /* Code to dissect a message block */
-guint
+static guint
 dissect_moldudp64_msgblk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         guint offset, guint64 sequence)
 {

diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 39b4f4d4697329a259a6a61c50c8b183619ca525..22570aec68b580762cac53f0404adce4a991385e 100644 (file)
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -457,7 +457,7 @@ mp2t_dissect_packet(tvbuff_t *tvb, enum pid_payload_type pload_type,
         call_dissector(data_handle, tvb, pinfo, tree);
 }
 
-guint
+static guint
 mp2t_get_packet_length(tvbuff_t *tvb, guint offset, packet_info *pinfo,
             guint32 frag_id, enum pid_payload_type pload_type)
 {

diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index 5e038825e11993497689a3d905d98a611315d136..55e506f259d32508195f0f77761d3e1ecd09a532 100644 (file)
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -38,6 +38,8 @@
 
 #include <epan/prefs.h>
 
+#include "packet-mp4ves.h"
+
 void proto_register_mp4ves(void);
 void proto_reg_handoff_mp4ves(void);
 
@@ -679,7 +681,7 @@ dissect_mp4ves_config(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        dissect_mp4ves_VisualObjectSequence(tvb, pinfo, mp4ves_tree, 0);
 }
 
-void
+static void
 dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        int bit_offset = 0;

diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c
index 0fbc579be7a6ead7f024f2c7f586bd92c4da4f15..41eae8bd97894ea147b8bffeaced4b6f8eb6de5e 100644 (file)
--- a/epan/dissectors/packet-mpeg-descriptor.c
+++ b/epan/dissectors/packet-mpeg-descriptor.c
@@ -29,6 +29,7 @@
 #include <epan/dvb_chartbl.h>
 #include <epan/packet.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
+#include "packet-mpeg-descriptor.h"
 
 void proto_register_mpeg_descriptor(void);
 

diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index 805298fe5e89154ae0c411d3ae3fbea1270bc4d7..9205fd787bef4004c74db2678aa31244d43ba184 100644 (file)
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -99,12 +99,12 @@ static gint ett_mqpcf_cfh = -1;
 
 #define MQ_TEXT_CFH   "MQ Command Format Header"
 
-guint32 dissect_mqpcf_getDigits(guint uCnt)
+static guint32 dissect_mqpcf_getDigits(guint uCnt)
 {
     return (guint) log10(uCnt) + 1;
 }
 
-guint8 *dissect_mqpcf_parm_getintval(guint uPrm, guint uVal)
+static guint8 *dissect_mqpcf_parm_getintval(guint uPrm, guint uVal)
 {
     value_string *pVs;
     pVs = (value_string *)try_val_to_str(uPrm, GET_VALSV(MQCFINT_Parse));
@@ -116,7 +116,7 @@ guint8 *dissect_mqpcf_parm_getintval(guint uPrm, guint uVal)
     return NULL;
 }
 
-void dissect_mqpcf_parm_int(tvbuff_t *tvb, proto_tree *tree, guint offset, guint uPrm,
+static void dissect_mqpcf_parm_int(tvbuff_t *tvb, proto_tree *tree, guint offset, guint uPrm,
                             guint uVal, int hfindex, guint iCnt, guint iMaxCnt, guint iDigit, gboolean bParse)
 {
     header_field_info *hfinfo;

diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index d5b07ed815e4f50243fa1548d18301af00588574..aa016d02afa2386532bc240fc51651579e546a0d 100755 (executable)
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -5752,6 +5752,7 @@ def produce_code():
 #include "packet-ncp-sss.h"
 
 /* Function declarations for functions used in proto_register_ncp2222() */
+void proto_register_ncp2222(void);
 static void ncp_init_protocol(void);
 static void ncp_postseq_cleanup(void);