diff options
author | Jörg Mayer <jmayer@loplof.de> | 2005-08-02 04:31:42 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2005-08-02 04:31:42 +0000 |
commit | 7b2ff03d8ca50d777936fa698432c7849f6d9b53 (patch) | |
tree | 8cf286d72bec9f98015bef89e28f4be59c9cbdbd | |
parent | f5afb4da1b370a4e80d97d21e1876ba94605a18e (diff) |
Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15169
-rw-r--r-- | epan/dissectors/packet-aim-messaging.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-aim.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-atsvc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-nt.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ipmi.c | 60 | ||||
-rw-r--r-- | epan/dissectors/packet-isup.c | 38 | ||||
-rw-r--r-- | epan/dissectors/packet-kerberos.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-nlsp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-pcnfsd.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-pflog.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-pgm.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-pim.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-pkcs1.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-q933.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-sigcomp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sip.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-wbxml.c | 36 | ||||
-rw-r--r-- | epan/dissectors/packet-x509if.c | 1 |
18 files changed, 96 insertions, 93 deletions
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 92131fc0d9..8e792ef544 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -348,7 +348,7 @@ static const aim_client_plugin known_client_plugins[] = { { NULL, {0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } } } }; -const aim_client_plugin *aim_find_plugin ( e_uuid_t uuid) +static const aim_client_plugin *aim_find_plugin ( e_uuid_t uuid) { int i; @@ -363,7 +363,7 @@ const aim_client_plugin *aim_find_plugin ( e_uuid_t uuid) return NULL; } -int dissect_aim_plugin(proto_tree *entry, tvbuff_t *tvb, int offset, e_uuid_t* out_plugin_uuid) +static int dissect_aim_plugin(proto_tree *entry, tvbuff_t *tvb, int offset, e_uuid_t* out_plugin_uuid) { const aim_client_plugin *plugin = NULL; e_uuid_t uuid; diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index fe2857874a..89fde56cac 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -690,7 +690,7 @@ int dissect_aim_userinfo(tvbuff_t *tvb, packet_info *pinfo, return dissect_aim_tlv_list(tvb, pinfo, offset, tree, onlinebuddy_tlvs); } -int dissect_aim_fnac_flags(tvbuff_t *tvb, int offset, int len, proto_item *ti, guint16 flags) +static int dissect_aim_fnac_flags(tvbuff_t *tvb, int offset, int len, proto_item *ti, guint16 flags) { proto_tree *entry = proto_item_add_subtree(ti, ett_aim_fnac_flags); proto_tree_add_boolean(entry, hf_aim_fnac_flag_next_is_related, tvb, offset, len, flags); @@ -994,7 +994,7 @@ static const aim_client_capability known_client_caps[] = { { NULL, {0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } } } }; -const aim_client_capability *aim_find_capability ( e_uuid_t clsid) +static const aim_client_capability *aim_find_capability ( e_uuid_t clsid) { int i; diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index cb4180f4cb..0f22d65445 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -133,7 +133,7 @@ static gint ett_atsvc_enum_ctr = -1; -int +static int atsvc_dissect_JobTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param _U_) { guint32 job_time; diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 5a1bd4aaa5..feaef59b22 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -211,7 +211,7 @@ dissect_ndr_counted_byte_array_cb(tvbuff_t *tvb, int offset, return offset; } -void cb_byte_array_postprocess(packet_info *pinfo, proto_tree *tree _U_, +static void cb_byte_array_postprocess(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, tvbuff_t *tvb, int start_offset, int end_offset, void *callback_args) diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 616b7b8e58..b16d37fa4b 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1524,7 +1524,7 @@ typedef struct _ipmi_cmd_dissect{ /* Sensor/Event NetFN (0x04) */ -void +static void dissect_cmd_PlatformEventMessage(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype) { @@ -1735,7 +1735,7 @@ dissect_cmd_PlatformEventMessage(proto_tree *tree, proto_tree *ipmi_tree, packet } -void +static void dissect_cmd_GetDeviceSDR(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype _U_) { @@ -1788,7 +1788,7 @@ dissect_cmd_GetDeviceSDR(proto_tree *tree, proto_tree *ipmi_tree, packet_info *p } -void +static void dissect_cmd_Get_Device_SDR_Info(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -1842,7 +1842,7 @@ dissect_cmd_Get_Device_SDR_Info(proto_tree *tree, proto_tree *ipmi_tree, packet_ } -void +static void dissect_cmd_Reserve_Device_SDR_Repository(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -1862,7 +1862,7 @@ dissect_cmd_Reserve_Device_SDR_Repository(proto_tree *tree, proto_tree *ipmi_tre } -void +static void dissect_cmd_Set_Sensor_Hysteresis(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -1895,7 +1895,7 @@ dissect_cmd_Set_Sensor_Hysteresis(proto_tree *tree, proto_tree *ipmi_tree, packe } -void +static void dissect_cmd_Get_Sensor_Hysteresis(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -1927,7 +1927,7 @@ dissect_cmd_Get_Sensor_Hysteresis(proto_tree *tree, proto_tree *ipmi_tree, packe } -void +static void dissect_cmd_Set_Sensor_Thresholds(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2001,7 +2001,7 @@ dissect_cmd_Set_Sensor_Thresholds(proto_tree *tree, proto_tree *ipmi_tree, packe } -void +static void dissect_cmd_Get_Sensor_Thresholds(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2076,7 +2076,7 @@ dissect_cmd_Get_Sensor_Thresholds(proto_tree *tree, proto_tree *ipmi_tree, packe } -void +static void dissect_cmd_Get_Sensor_Reading(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype) { @@ -2220,7 +2220,7 @@ dissect_cmd_Get_Sensor_Reading(proto_tree *tree, proto_tree *ipmi_tree, packet_i /* App NetFN (0x06) */ -void +static void dissect_cmd_Get_Device_ID(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype) { @@ -2352,7 +2352,7 @@ dissect_cmd_Get_Device_ID(proto_tree *tree, proto_tree *ipmi_tree, packet_info * /* Storage NetFN (0x0a) */ -void +static void dissect_cmd_Get_FRU_Inventory_Area_Info(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2399,7 +2399,7 @@ dissect_cmd_Get_FRU_Inventory_Area_Info(proto_tree *tree, proto_tree *ipmi_tree, } -void +static void dissect_cmd_Get_SEL_Info(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2483,7 +2483,7 @@ dissect_cmd_Get_SEL_Info(proto_tree *tree, proto_tree *ipmi_tree, packet_info *p } -void +static void dissect_cmd_Reserve_SEL(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -2503,7 +2503,7 @@ dissect_cmd_Reserve_SEL(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pi } -void +static void dissect_cmd_Get_SEL_Entry(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype _U_) { @@ -2556,7 +2556,7 @@ dissect_cmd_Get_SEL_Entry(proto_tree *tree, proto_tree *ipmi_tree, packet_info * } -void +static void dissect_cmd_Clear_SEL(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2620,7 +2620,7 @@ dissect_cmd_Clear_SEL(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinf /* Picmg NetFN (0x2c) */ -void +static void dissect_cmd_Get_PICMG_Properties(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -2662,7 +2662,7 @@ dissect_cmd_Get_PICMG_Properties(proto_tree *tree, proto_tree *ipmi_tree, packet } -void +static void dissect_cmd_FRU_Control(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -2698,7 +2698,7 @@ dissect_cmd_FRU_Control(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pi } -void +static void dissect_cmd_Get_FRU_Led_Properties(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2760,7 +2760,7 @@ dissect_cmd_Get_FRU_Led_Properties(proto_tree *tree, proto_tree *ipmi_tree, pack } -void +static void dissect_cmd_Get_Led_Color_Capabilities(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2862,7 +2862,7 @@ dissect_cmd_Get_Led_Color_Capabilities(proto_tree *tree, proto_tree *ipmi_tree, } -void +static void dissect_cmd_Set_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -2929,7 +2929,7 @@ dissect_cmd_Set_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_in } -void +static void dissect_cmd_Get_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -3047,7 +3047,7 @@ dissect_cmd_Get_FRU_Led_State(proto_tree *tree, proto_tree *ipmi_tree, packet_in } -void +static void dissect_cmd_Set_FRU_Activation_Policy(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -3177,7 +3177,7 @@ dissect_cmd_Set_FRU_Activation_Policy(proto_tree *tree, proto_tree *ipmi_tree, p } -void +static void dissect_cmd_Get_FRU_Activation_Policy(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype) { @@ -3229,7 +3229,7 @@ dissect_cmd_Get_FRU_Activation_Policy(proto_tree *tree, proto_tree *ipmi_tree, p } -void +static void dissect_cmd_Set_FRU_Activation(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -3265,7 +3265,7 @@ dissect_cmd_Set_FRU_Activation(proto_tree *tree, proto_tree *ipmi_tree, packet_i } -void +static void dissect_cmd_Get_Device_Locator_Record_ID(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -3302,7 +3302,7 @@ dissect_cmd_Get_Device_Locator_Record_ID(proto_tree *tree, proto_tree *ipmi_tree } -void +static void dissect_cmd_Set_Power_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -3342,7 +3342,7 @@ dissect_cmd_Set_Power_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info } -void +static void dissect_cmd_Get_Power_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype) { @@ -3419,7 +3419,7 @@ dissect_cmd_Get_Power_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info } -void +static void dissect_cmd_Set_Fan_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len _U_, guint8 response, guint8 authtype _U_) { @@ -3454,7 +3454,7 @@ dissect_cmd_Set_Fan_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info * } -void +static void dissect_cmd_Get_Fan_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint *poffset, guint8 len, guint8 response, guint8 authtype _U_) { @@ -3502,7 +3502,7 @@ dissect_cmd_Get_Fan_Level(proto_tree *tree, proto_tree *ipmi_tree, packet_info * /******************************************lane**********************************************/ -void dissect_ipmi_data(proto_tree *, proto_tree *, packet_info *, tvbuff_t *, gint *, +static void dissect_ipmi_data(proto_tree *, proto_tree *, packet_info *, tvbuff_t *, gint *, guint8, guint8, guint8, guint8,guint8); diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index dff714552e..e618be2552 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -1345,7 +1345,7 @@ guint8 tap_cause_value = 0; /* ------------------------------------------------------------------ Mapping number to ASCII-character ------------------------------------------------------------------ */ -char number_to_char(int number) +static char number_to_char(int number) { if (number < 10) return ((char) number + ASCII_NUMBER_DELTA); @@ -4671,7 +4671,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb,packet_info *p /* ------------------------------------------------------------------ Dissector Message Type Initial address message */ -gint +static gint dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4751,7 +4751,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre /* ------------------------------------------------------------------ Dissector Message Type subsequent address message */ -gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree *isup_tree) +static gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; tvbuff_t *parameter_tvb; @@ -4783,7 +4783,7 @@ gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree * /* ------------------------------------------------------------------ Dissector Message Type Information request message */ -gint +static gint dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4807,7 +4807,7 @@ dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup /* ------------------------------------------------------------------ Dissector Message Type Information */ -gint +static gint dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4831,7 +4831,7 @@ dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ Dissector Message Type Continuity */ -gint +static gint dissect_isup_continuity_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4855,7 +4855,7 @@ dissect_isup_continuity_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ Dissector Message Type Address complete */ -gint +static gint dissect_isup_address_complete_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4879,7 +4879,7 @@ dissect_isup_address_complete_message(tvbuff_t *message_tvb, proto_tree *isup_tr /* ------------------------------------------------------------------ Dissector Message Type Connect */ -gint +static gint dissect_isup_connect_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4903,7 +4903,7 @@ dissect_isup_connect_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ Dissector Message Type release message */ -gint +static gint dissect_isup_release_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4935,7 +4935,7 @@ dissect_isup_release_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ Dissector Message Type Resume/Suspend */ -gint +static gint dissect_isup_suspend_resume_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4959,7 +4959,7 @@ dissect_isup_suspend_resume_message(tvbuff_t *message_tvb, proto_tree *isup_tree /* ------------------------------------------------------------------ Dissector Message Type Circuit group reset/query message */ -gint +static gint dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -4991,7 +4991,7 @@ dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree /* ------------------------------------------------------------------ Dissector Message Type Circuit group blocking/blocking ack/unblocking/unblocking ack messages */ -gint +static gint dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5036,7 +5036,7 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree * /* ------------------------------------------------------------------ Dissector Message Type Facility request/accepted */ -gint +static gint dissect_isup_facility_request_accepted_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5060,7 +5060,7 @@ dissect_isup_facility_request_accepted_message(tvbuff_t *message_tvb, proto_tree /* ------------------------------------------------------------------ Dissector Message Type Facility reject */ -gint +static gint dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5104,7 +5104,7 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre /* ------------------------------------------------------------------ Dissector Message Type Circuit group reset acknowledgement message */ -gint +static gint dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5136,7 +5136,7 @@ dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, /* ------------------------------------------------------------------ Dissector Message Type Circuit group query response message */ -gint +static gint dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5187,7 +5187,7 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t /* ------------------------------------------------------------------ Dissector Message Type Call Progress */ -gint +static gint dissect_isup_call_progress_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5211,7 +5211,7 @@ dissect_isup_call_progress_message(tvbuff_t *message_tvb, proto_tree *isup_tree) /* ------------------------------------------------------------------ Dissector Message Type User-to-User information */ -gint +static gint dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; @@ -5243,7 +5243,7 @@ dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, proto_tree /* ------------------------------------------------------------------ Dissector Message Type Confusion */ -gint +static gint dissect_isup_confusion_message(tvbuff_t *message_tvb, proto_tree *isup_tree) { proto_item* parameter_item; proto_tree* parameter_tree; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index d9e991c547..6801a6db69 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -3844,7 +3844,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; } -void +static void kerberos_prefs_apply_cb(void) { #ifdef HAVE_LIBNETTLE clear_keytab(); diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 11b3159510..88fa5f265e 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -146,7 +146,7 @@ typedef struct { * Output: * void (may modify proto tree) */ -void +static void nlsp_dissect_unknown(tvbuff_t *tvb, proto_tree *tree, int offset, char *fmat, ...) { diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c index 6cddd7b5ac..e61ba6b79f 100644 --- a/epan/dissectors/packet-pcnfsd.c +++ b/epan/dissectors/packet-pcnfsd.c @@ -63,7 +63,7 @@ static gint ett_pcnfsd_auth_ident = -1; static gint ett_pcnfsd_auth_password = -1; static gint ett_pcnfsd_gids = -1; -int +static int dissect_pcnfsd_username(tvbuff_t *tvb, int offset, proto_tree *tree) { return dissect_rpc_string(tvb, tree, hf_pcnfsd_username, offset, NULL); @@ -83,7 +83,7 @@ static const value_string names_mapreq[] = { 0, NULL } }; -int +static int dissect_pcnfsd_mapreq(tvbuff_t *tvb, int offset, proto_tree *tree) { guint32 mapreq; @@ -99,7 +99,7 @@ dissect_pcnfsd_mapreq(tvbuff_t *tvb, int offset, proto_tree *tree) return offset; } -int +static int dissect_pcnfsd2_dissect_mapreq_arg_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { @@ -112,7 +112,7 @@ dissect_pcnfsd2_dissect_mapreq_arg_item(tvbuff_t *tvb, int offset, return offset; } -int +static int dissect_pcnfsd2_mapid_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -136,7 +136,7 @@ static const value_string names_maprstat[] = { 0, NULL } }; -int +static int dissect_pcnfsd2_dissect_mapreq_res_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { @@ -159,7 +159,7 @@ dissect_pcnfsd2_dissect_mapreq_res_item(tvbuff_t *tvb, int offset, return offset; } -int +static int dissect_pcnfsd2_mapid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 90e8a7ef22..2412068a8d 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -78,7 +78,7 @@ static int hf_old_pflog_dir = -1; static gint ett_old_pflog = -1; -void +static void capture_pflog(const guchar *pd, int offset, int len, packet_counts *ld) { const struct pfloghdr *pflogh; @@ -317,7 +317,7 @@ proto_reg_handoff_pflog(void) } -void +static void capture_old_pflog(const guchar *pd, int offset, int len, packet_counts *ld) { struct old_pfloghdr pflogh; diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index cab0d4a7bc..de696e3fb5 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -1130,7 +1130,7 @@ static const value_string poll_subtype_vals[] = { /* separated into a stand alone routine to other protocol dissectors */ /* can call to it, ie. socks */ -void +static void decode_pgm_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, pgm_type *pgmhdr) { @@ -1158,7 +1158,7 @@ decode_pgm_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, call_dissector(data_handle,next_tvb, pinfo, tree); } -int +static int total_size(tvbuff_t *tvb, pgm_type *hdr) { int bytes = sizeof(pgm_type); diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index e9f8c2c4a6..ac0408c16e 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -40,6 +40,7 @@ #include <epan/afn.h> #include "packet-ipv6.h" #include <epan/in_cksum.h> +#include "packet-pim.h" #define PIM_TYPE(x) ((x) & 0x0f) #define PIM_VER(x) (((x) & 0xf0) >> 4) diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 0524e56036..19ba8f69a4 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -41,6 +41,7 @@ #include <stdio.h> #include <string.h> +#include "packet-pkcs1.h" #include "packet-ber.h" #include "packet-x509af.h" diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index 0fcc88d4ab..394fb96bd5 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -467,7 +467,7 @@ dissect_q933_protocol_discriminator(tvbuff_t *tvb, int offset, proto_tree *tree) } } -void +static void dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { @@ -886,7 +886,7 @@ static const value_string q933_rejection_reason_vals[] = { { 0x00, NULL } }; -void +static void dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree, int hf_cause_value) { @@ -1319,7 +1319,7 @@ static const value_string q933_progress_description_vals[] = { { 0, NULL } }; -void +static void dissect_q933_progress_indicator_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { @@ -1757,7 +1757,7 @@ static const value_string q933_audiovisual_characteristics_vals[] = { { 0x00, NULL } }; -void +static void dissect_q933_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { @@ -1832,7 +1832,7 @@ static const value_string q933_protocol_discriminator_vals[] = { { 0, NULL } }; -void +static void dissect_q933_user_user_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 966e5cc82e..b4055fbb14 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -273,7 +273,7 @@ static void tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree); /* Initialize the state handler * */ -void +static void sigcomp_init_protocol(void) { sigcomp_init_udvm(); diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 0c89a19929..76fb97ca2d 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -488,7 +488,7 @@ typedef struct /* Hash table functions */ /* Equal keys */ -gint sip_equal(gconstpointer v, gconstpointer v2) +static gint sip_equal(gconstpointer v, gconstpointer v2) { const sip_hash_key* val1 = v; const sip_hash_key* val2 = v2; @@ -508,7 +508,7 @@ gint sip_equal(gconstpointer v, gconstpointer v2) /* Compute a hash value for a given key. */ /* Don't try to use addresses here, call-id should be almost unique. */ -guint sip_hash_func(gconstpointer v) +static guint sip_hash_func(gconstpointer v) { gint n; const sip_hash_key *key = v; diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index cfa30377cd..09d2a14933 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -219,7 +219,7 @@ typedef char * (* ext_t_func_ptr)(tvbuff_t *, guint32, guint32); typedef char * (* opaque_token_func_ptr)(tvbuff_t *, guint32, guint8, guint8, guint32 *); typedef char * (* opaque_literal_func_ptr)(tvbuff_t *, guint32, const char *, guint8, guint32 *); -char * +static char * default_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, guint8 token _U_, guint8 codepage _U_, guint32 *length) { @@ -229,7 +229,7 @@ default_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * default_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, const char *token _U_, guint8 codepage _U_, guint32 *length) { @@ -239,7 +239,7 @@ default_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * default_opaque_binary_attr(tvbuff_t *tvb, guint32 offset, guint8 token _U_, guint8 codepage _U_, guint32 *length) { @@ -249,7 +249,7 @@ default_opaque_binary_attr(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * default_opaque_literal_attr(tvbuff_t *tvb, guint32 offset, const char *token _U_, guint8 codepage _U_, guint32 *length) { @@ -261,7 +261,7 @@ default_opaque_literal_attr(tvbuff_t *tvb, guint32 offset, /* Render a hex %dateTime encoded timestamp as a string. * 0x20011231123456 becomes "2001-12-31T12:34:56Z" */ -char * +static char * date_time_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len) { char *str; @@ -316,7 +316,7 @@ date_time_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len) /* Is ALWAYS 6 bytes long: * 00YY YYYY YYYY YYMM MMDD DDDh hhhh mmmm mmss ssss ZZZZ ZZZZ */ -char * +static char * wv_datetime_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len) { char *str; @@ -361,7 +361,7 @@ wv_datetime_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len) /* WV-CSP integer values for tag content is encoded in a fashion similar * to a Long-Integer in WSP */ -char * +static char * wv_integer_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len) { char *str; @@ -392,7 +392,7 @@ wv_integer_from_opaque(tvbuff_t *tvb, guint32 offset, guint32 data_len) return str; } -char * +static char * wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, const char *token, guint8 codepage _U_, guint32 *length) { @@ -427,7 +427,7 @@ wv_csp10_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * wv_csp10_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, guint8 token, guint8 codepage, guint32 *length) { @@ -489,7 +489,7 @@ wv_csp10_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * wv_csp11_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, const char *token, guint8 codepage _U_, guint32 *length) { @@ -525,7 +525,7 @@ wv_csp11_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, guint8 token, guint8 codepage, guint32 *length) { @@ -596,7 +596,7 @@ wv_csp11_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * wv_csp12_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, const char *token, guint8 codepage _U_, guint32 *length) { @@ -634,7 +634,7 @@ wv_csp12_opaque_literal_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * wv_csp12_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, guint8 token, guint8 codepage, guint32 *length) { @@ -716,7 +716,7 @@ wv_csp12_opaque_binary_tag(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * sic10_opaque_literal_attr(tvbuff_t *tvb, guint32 offset, const char *token, guint8 codepage _U_, guint32 *length) { @@ -736,7 +736,7 @@ sic10_opaque_literal_attr(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * sic10_opaque_binary_attr(tvbuff_t *tvb, guint32 offset, guint8 token, guint8 codepage, guint32 *length) { @@ -766,7 +766,7 @@ sic10_opaque_binary_attr(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * emnc10_opaque_literal_attr(tvbuff_t *tvb, guint32 offset, const char *token, guint8 codepage _U_, guint32 *length) { @@ -785,7 +785,7 @@ emnc10_opaque_literal_attr(tvbuff_t *tvb, guint32 offset, return str; } -char * +static char * emnc10_opaque_binary_attr(tvbuff_t *tvb, guint32 offset, guint8 token, guint8 codepage, guint32 *length) { @@ -4768,7 +4768,7 @@ static const wbxml_decoding decode_wv_cspc_12 = { /* Discriminator for WV-CSP; allows version detection based on parsing parts * of the start of the WBXML body. */ -const wbxml_decoding * +static const wbxml_decoding * wv_csp_discriminator(tvbuff_t *tvb, guint32 offset) { guint32 magic_1 = tvb_get_ntohl(tvb, offset + 0); diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 36b4f1a286..b7e88eafe8 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -43,6 +43,7 @@ #include "packet-ber.h" #include "packet-x509sat.h" +#include "packet-x509if.h" #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" |