diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-12-18 06:51:09 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-12-18 06:51:09 +0000 |
commit | e8b935ad6ea1117f9d8787f090819ecc54bbbb98 (patch) | |
tree | 2b1684472baf0d96b504740b05c853a857c62063 /epan | |
parent | 7dfbe304a7167e665b8e7b21708055d77b0eccde (diff) |
Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54209
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-dcerpc-update.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-dcom-sysact.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcom.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-enip.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_rr.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.c | 24 | ||||
-rw-r--r-- | epan/dissectors/packet-infiniband.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-kerberos.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-llc.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-moldudp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-moldudp64.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-mp2t.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-mp4ves.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-mq-pcf.c | 6 |
15 files changed, 33 insertions, 26 deletions
diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c index 1922bf53fa..490bb1acf3 100644 --- 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 cf5613d476..05d987090e 100644 --- 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 55fbc17fef..e485ef85e1 100644 --- 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 d9149cadfa..9e494f0282 100644 --- 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 8c08eaa6c7..2e1b3c236b 100644 --- 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 640f2364c2..b0a6b03d4f 100644 --- 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 33a223c4f5..f3ccb64262 100644 --- 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 7b624d791c..9b36e756d8 100644 --- 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 c2af88a1e1..ef2e28d957 100644 --- 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 84cb9d4b82..6de0bf50a7 100644 --- 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 e8202b503a..1509202eaa 100644 --- 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 39b4f4d469..22570aec68 100644 --- 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 5e038825e1..55e506f259 100644 --- 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 0fbc579be7..41eae8bd97 100644 --- 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 805298fe5e..9205fd787b 100644 --- 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; |