From 8756dc5fabc73d7bc1eba34b47347fb4d4f326d4 Mon Sep 17 00:00:00 2001 From: wmeier Date: Sun, 10 Oct 2010 23:28:40 +0000 Subject: Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h not req'd. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34464 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/Makefile.common | 1 - epan/dissectors/packet-gsm_bsslap.c | 4 +- epan/dissectors/packet-gsm_bssmap_le.c | 2 +- epan/dissectors/packet-gsm_sms.c | 14 +++--- epan/dissectors/packet-hpext.c | 2 +- epan/dissectors/packet-iec104.c | 42 ++++++++++-------- epan/dissectors/packet-imf.c | 4 +- epan/dissectors/packet-isakmp.c | 11 +++-- epan/dissectors/packet-iscsi.c | 2 +- epan/dissectors/packet-isup.c | 20 ++++----- epan/dissectors/packet-iwarp-ddp-rdmap.c | 6 +-- epan/dissectors/packet-kerberos.c | 7 ++- epan/dissectors/packet-ldss.c | 51 +++++++++++----------- epan/dissectors/packet-llc.c | 4 +- epan/dissectors/packet-lldp.c | 8 ++-- epan/dissectors/packet-lwapp.c | 73 ++++++++++++++++---------------- epan/dissectors/packet-meta.c | 2 +- epan/dissectors/packet-mikey.c | 6 +-- epan/dissectors/packet-mikey.h | 34 --------------- epan/dissectors/packet-mip6.c | 2 +- epan/dissectors/packet-mtp3.c | 4 +- 21 files changed, 129 insertions(+), 170 deletions(-) delete mode 100644 epan/dissectors/packet-mikey.h (limited to 'epan/dissectors') diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index a1534e37a2..48de8d2e7a 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -1154,7 +1154,6 @@ DISSECTOR_INCLUDES = \ packet-mac-lte.h \ packet-meta.h \ packet-mgcp.h \ - packet-mikey.h \ packet-mms.h \ packet-mount.h \ packet-mp4ves.h \ diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index a04f4dc182..d0841f8702 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -145,7 +145,7 @@ const value_string gsm_bsslap_elem_strings[] = { #define BSSLAP_U_TDOA_RES 18 /* Table 5.1.1: Message Type codes */ -const value_string gsm_a_bsslap_msg_strings[] = { +static const value_string gsm_a_bsslap_msg_strings[] = { { 0x00, "Reserved" }, { BSSLAP_TA_REQUEST, "TA REQUEST" }, { BSSLAP_TA_RESPONSE, "TA RESPONSE" }, @@ -267,7 +267,7 @@ de_rrlp_ie(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar /* * The Cell identification discriminator i is coded as follows: */ -const value_string gsm_a_bsslap_cell_id_disc_vals[] = { +static const value_string gsm_a_bsslap_cell_id_disc_vals[] = { { 0x0, "The whole Cell Global Identification, CGI, is used to identify the 2G cells" }, { 0x1, "Location Area Code, LAC, and Cell Identify, CI, are used to identify the 2G cells" }, { 0x2, "3G Cell identification container 1" }, diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index c7520b9988..89da14659e 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -53,7 +53,7 @@ #define BSSMAP_LE_RESET 48 #define BSSMAP_LE_RESET_ACKNOWLEDGE 49 -const value_string gsm_bssmap_le_msg_strings[] = { +static const value_string gsm_bssmap_le_msg_strings[] = { { 0, "Reserved" }, { 1, "Reserved" }, { 2, "Reserved" }, diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index c70da36506..ae4fa19eb3 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -193,13 +193,13 @@ static const value_string gsm_sms_coding_group_bits_vals[] = { { 0, NULL }, }; -guint16 g_sm_id; -guint16 g_frags; -guint16 g_frag; +static guint16 g_sm_id; +static guint16 g_frags; +static guint16 g_frag; -guint16 g_port_src; -guint16 g_port_dst; -static gboolean g_is_wsp; +static guint16 g_port_src; +static guint16 g_port_dst; +static gboolean g_is_wsp; static dissector_table_t gsm_sms_dissector_tbl; /* Short Message reassembly */ @@ -2529,7 +2529,7 @@ dis_field_ud_iei(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint8 length) /* 9.2.3.24 */ #define NUM_FILL_BITS_MASKS 6 #define SMS_MAX_MESSAGE_SIZE 160 -char messagebuf[SMS_MAX_MESSAGE_SIZE+1]; +static char messagebuf[SMS_MAX_MESSAGE_SIZE+1]; static void dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gboolean udhi, guint8 udl, gboolean seven_bit, gboolean eight_bit, gboolean ucs2, gboolean compressed) diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index 259fae689f..1a3042df54 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.c @@ -45,7 +45,7 @@ static int hf_hpext_sxsap = -1; static gint ett_hpext = -1; -const value_string xsap_vals[] = { +static const value_string xsap_vals[] = { { HPEXT_DXSAP, "RBOOT Destination Service Access Point" }, { HPEXT_SXSAP, "RBOOT Source Service Access Point" }, { HPEXT_HPSW, "HP Switch Protocol" }, diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index a6f6c4b686..fe04b68eac 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -490,7 +490,7 @@ static gint ett_asdu = -1; that starts 'offset' bytes in 'tvb'. The time and date is put in struct 'cp56t' ==================================================================== */ -void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint16 ms; ms = tvb_get_letohs( tvb , *offset ); @@ -535,7 +535,7 @@ void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree Information object address (Identifier) ASDU -> Inform Object #1 -> Information object address ==================================================================== */ -void get_InfoObjectAddress( guint32 *asdu_info_obj_addr, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_InfoObjectAddress( guint32 *asdu_info_obj_addr, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* -------- Information object address */ *asdu_info_obj_addr = tvb_get_letoh24(tvb, *offset); @@ -554,7 +554,7 @@ void get_InfoObjectAddress( guint32 *asdu_info_obj_addr, tvbuff_t *tvb, guint8 * /* ==================================================================== SIQ: Single-point information (IEV 371-02-07) w quality descriptor ==================================================================== */ -void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 siq; siq = tvb_get_guint8(tvb, *offset); @@ -582,7 +582,7 @@ void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie /* ==================================================================== DIQ: Double-point information (IEV 371-02-08) w quality descriptor ==================================================================== */ -void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 diq; @@ -629,7 +629,7 @@ void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie /* ==================================================================== QDS: Quality descriptor (separate octet) ==================================================================== */ -void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 qds; /* -------- QDS quality description */ @@ -657,25 +657,29 @@ void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie QDP: Quality descriptor for events of protection equipment (separate octet) ==================================================================== */ -void get_QDP( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) +#if 0 +static void get_QDP( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) { /* todo */ } +#endif /* ==================================================================== VTI: Value with transient state indication ==================================================================== */ -void get_VTI( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) +#if 0 +static void get_VTI( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) { /* todo */ } +#endif /* ==================================================================== NVA: Normalized value ==================================================================== */ -void get_NVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_NVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Normalized value F16[1..16]<-1..+1-2^-15> */ value->MV.NVA = tvb_get_letohs(tvb, *offset); @@ -690,7 +694,7 @@ void get_NVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -void get_NVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, +static void get_NVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Normalized value F16[1..16]<-1..+1-2^-15> */ @@ -709,7 +713,7 @@ void get_NVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, /* ==================================================================== SVA: Scaled value ==================================================================== */ -void get_SVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_SVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Scaled value I16[1..16]<-2^15..+2^15-1> */ value->MV.SVA = tvb_get_letohs(tvb, *offset); @@ -722,7 +726,7 @@ void get_SVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -void get_SVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, +static void get_SVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Scaled value I16[1..16]<-2^15..+2^15-1> */ @@ -739,7 +743,7 @@ void get_SVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, /* ==================================================================== "FLT": Short floating point number ==================================================================== */ -void get_FLT( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_FLT( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* -------- IEEE 754 float value */ value->MV.FLT = tvb_get_letohieee_float(tvb, *offset); @@ -754,7 +758,7 @@ void get_FLT( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -void get_FLTspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_FLTspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* -------- IEEE 754 float value */ spt->SP.FLT = tvb_get_letohieee_float(tvb, *offset); @@ -778,16 +782,18 @@ void get_FLTspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 /* ==================================================================== todo -- SEP: Single event of protection equipment ==================================================================== */ -void get_SEP( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) +#if 0 +static void get_SEP( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) { /* todo */ } +#endif /* ==================================================================== QOC: Qualifier Of Command ==================================================================== */ -void get_QOC( td_CmdInfo *value, guint8 data ) +static void get_QOC( td_CmdInfo *value, guint8 data ) { value->ZeroP = FALSE; /* No pulse */ value->ShortP = FALSE; /* Short Pulse */ @@ -824,7 +830,7 @@ void get_QOC( td_CmdInfo *value, guint8 data ) /* ==================================================================== QOS: Qualifier Of Set-point command ==================================================================== */ -void get_QOS( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_QOS( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 qos; /* -------- QOS quality description */ @@ -847,7 +853,7 @@ void get_QOS( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_ /* ==================================================================== SCO: Single Command (IEV 371-03-02) ==================================================================== */ -void get_SCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_SCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 data; /* On/Off */ @@ -883,7 +889,7 @@ void get_SCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 /* ==================================================================== DCO: Double Command (IEV 371-03-03) ==================================================================== */ -void get_DCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) +static void get_DCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 data; /* On/Off */ diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 5cb9662da3..791f1fa914 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -28,9 +28,7 @@ #include "config.h" #endif -#include #include -#include #include #include #include @@ -150,7 +148,7 @@ static void dissect_imf_address(tvbuff_t *tvb, int offset, int length, proto_ite static void dissect_imf_address_list(tvbuff_t *tvb, int offset, int length, proto_item *item); static void dissect_imf_mailbox_list(tvbuff_t *tvb, int offset, int length, proto_item *item); -struct imf_field imf_fields[] = { +static struct imf_field imf_fields[] = { {"unknown-extension", &hf_imf_extension_type, NO_SUBDISSECTION, FALSE}, /* unknown extension */ {"date", &hf_imf_date, NO_SUBDISSECTION, FALSE}, /* date-time */ {"from", &hf_imf_from, dissect_imf_mailbox_list , TRUE}, /* mailbox_list */ diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index b799e84222..b16222150a 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -44,7 +44,6 @@ #endif #include -#include #include @@ -1609,7 +1608,7 @@ static const value_string vs_ikev2_auth_algs[] = { {0, NULL} }; -ikev2_encr_alg_spec_t* ikev2_decrypt_find_encr_spec(guint num) { +static ikev2_encr_alg_spec_t* ikev2_decrypt_find_encr_spec(guint num) { ikev2_encr_alg_spec_t *e; for (e = ikev2_encr_algs; e->number != 0; e++) { @@ -1620,7 +1619,7 @@ ikev2_encr_alg_spec_t* ikev2_decrypt_find_encr_spec(guint num) { return NULL; } -ikev2_auth_alg_spec_t* ikev2_decrypt_find_auth_spec(guint num) { +static ikev2_auth_alg_spec_t* ikev2_decrypt_find_auth_spec(guint num) { ikev2_auth_alg_spec_t *a; for (a = ikev2_auth_algs; a->number != 0; a++) { @@ -2446,7 +2445,7 @@ static const byte_string vendor_id[] = { Returns the associated string ptr, and sets "*idx" to the index in that table, on a match, and returns NULL, and sets "*idx" to -1, on failure. */ -const gchar* +static const gchar* match_strbyte_idx(const guint8 *val, const gint val_len, const byte_string *vs, gint *idx) { gint i = 0; @@ -2464,7 +2463,7 @@ match_strbyte_idx(const guint8 *val, const gint val_len, const byte_string *vs, return NULL; } /* Like match_strbyte_idx(), but doesn't return the index. */ -const gchar* +static const gchar* match_strbyte(const guint8 *val,const gint val_len, const byte_string *vs) { gint ignore_me; return match_strbyte_idx(val, val_len, vs, &ignore_me); @@ -2473,7 +2472,7 @@ match_strbyte(const guint8 *val,const gint val_len, const byte_string *vs) { /* Tries to match val against each element in the value_string array vs. Returns the associated string ptr on a match. Formats val with fmt, and returns the resulting string, on failure. */ -const gchar* +static const gchar* byte_to_str(const guint8 *val,const gint val_len, const byte_string *vs, const char *fmt) { const gchar *ret; diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index c9e4f5ae53..fdf9864e47 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -538,7 +538,7 @@ iscsi_min(int a, int b) { dissector for the address/port that TargetAddress points to. (it starts to be common to use redirectors to point to non-3260 ports) */ -void +static void iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val) { address *addr = NULL; diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index f583b695e2..14fb025f4a 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -42,8 +42,6 @@ # include "config.h" #endif -#include - #include #include @@ -741,7 +739,7 @@ const value_string isup_calling_partys_category_value[] = { #define CVR_RSP_IND_FAILURE 0 #define CVR_RSP_IND_SUCCESS 1 -const value_string isup_cvr_rsp_ind_value[ ] = { +static const value_string isup_cvr_rsp_ind_value[ ] = { { CVR_RSP_IND_FAILURE, "CVR Response Fail" }, { CVR_RSP_IND_SUCCESS, "CVR Response Success" }, { 0, NULL } @@ -752,7 +750,7 @@ const value_string isup_cvr_rsp_ind_value[ ] = { #define CVR_CG_IND_DOUBLE_SEIZE_EVEN 2 #define CVR_CG_IND_DOUBLE_SEIZE_ALL 3 -const value_string isup_cvr_cg_double_seize_value[ ] = { +static const value_string isup_cvr_cg_double_seize_value[ ] = { { CVR_CG_IND_DOUBLE_SEIZE_NONE, "Double Seize control NONE" }, { CVR_CG_IND_DOUBLE_SEIZE_ODD, "Double Seize control odd circuits"}, { CVR_CG_IND_DOUBLE_SEIZE_EVEN, "Double Seize control even circuits"}, @@ -765,7 +763,7 @@ const value_string isup_cvr_cg_double_seize_value[ ] = { #define CVR_CG_IND_CAR_IND_DIGITAL 2 #define CVR_CG_IND_CAR_IND_ANALOG_DIG 3 -const value_string isup_cvr_cg_car_ind_value[ ] = { +static const value_string isup_cvr_cg_car_ind_value[ ] = { { CVR_CG_IND_CAR_IND_UNKNOWN , "Carrier Type Unknown" }, { CVR_CG_IND_CAR_IND_ANALOG , "Carrier Type Analog" }, { CVR_CG_IND_CAR_IND_DIGITAL , "Carrier Type Digital"}, @@ -778,7 +776,7 @@ const value_string isup_cvr_cg_car_ind_value[ ] = { #define CVR_CG_IND_ALARM_CAR_IND_HARDWARE 2 #define CVR_CG_IND_ALARM_CAR_IND_SPARE 3 -const value_string isup_cvr_alarm_car_ind_value[ ] = { +static const value_string isup_cvr_alarm_car_ind_value[ ] = { { CVR_CG_IND_ALARM_CAR_IND_UNKNOWN , "Alarm Carrier Ind Default"}, { CVR_CG_IND_ALARM_CAR_IND_SOFTWARE , "Alarm Carrier Ind Software"}, { CVR_CG_IND_ALARM_CAR_IND_HARDWARE , "Alarm Carrier Ind Hardware"}, @@ -791,7 +789,7 @@ const value_string isup_cvr_alarm_car_ind_value[ ] = { #define CVR_CG_IND_CONT_CHK_STAT 2 #define CVR_CG_IND_CONT_CHK_PER_CALL 3 -const value_string isup_cvr_cont_chk_ind_value[ ] = { +static const value_string isup_cvr_cont_chk_ind_value[ ] = { { CVR_CG_IND_CONT_CHK_UNKNOWN , "Continuity Check Unknown"}, { CVR_CG_IND_CONT_CHK_NONE , "Continuity Check NONE"}, @@ -1784,9 +1782,9 @@ isup_apm_defragment_init(void) } /* Info for the tap that must be passed between procedures */ -gchar *tap_called_number = NULL; -gchar *tap_calling_number = NULL; -guint8 tap_cause_value = 0; +static gchar *tap_called_number = NULL; +static gchar *tap_calling_number = NULL; +static guint8 tap_cause_value = 0; /* ------------------------------------------------------------------ Mapping number to ASCII-character @@ -5188,7 +5186,7 @@ dissect_isup_generic_digits_parameter(tvbuff_t *parameter_tvb, proto_tree *param /* ------------------------------------------------------------------ Dissector Parameter Charge number */ -void +static void dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { proto_item *address_digits_item; diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index edad1792b1..051c00941e 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -257,7 +257,7 @@ static const value_string ddp_errcode_untagged_names[] = { }; /* update packet list pane in the GUI */ -void +static void ddp_rdma_packetlist(packet_info *pinfo, gboolean ddp_last_flag, guint8 rdma_msg_opcode) { @@ -279,7 +279,7 @@ ddp_rdma_packetlist(packet_info *pinfo, gboolean ddp_last_flag, } /* dissects RDMA Read Request and Terminate message header */ -void +static void dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, guint8 rdma_msg_opcode) { @@ -454,7 +454,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, * Main dissection routine which dissects a DDP segment and interprets the * header field rsvdULP according to RDMAP. */ -void +static void dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ddp_rdma_tree = NULL; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 15a57d5d2c..e7cedc982a 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -352,7 +352,7 @@ static gint ett_krb_PAC_MIDL_BLOB = -1; static gint ett_krb_PAC_DREP = -1; static gint ett_krb_PAC_UPN_DNS_INFO = -1; -guint32 krb5_errorcode; +static guint32 krb5_errorcode; static dissector_handle_t krb4_handle=NULL; @@ -1951,11 +1951,10 @@ dissect_krb5_pvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx * name-string[1] SEQUENCE OF GeneralString * } */ -guint32 name_type; +static guint32 name_type; static int dissect_krb5_name_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { - offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_name_type, &name_type); if(tree){ proto_item_append_text(tree, " (%s):", @@ -2325,7 +2324,7 @@ dissect_krb5_PW_SALT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac * -- might be encoded AP-REQ * } */ -guint32 krb_PA_DATA_type; +static guint32 krb_PA_DATA_type; static int dissect_krb5_PA_DATA_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index bf5e63a334..8d9d601a6e 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -13,12 +13,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -42,7 +42,6 @@ #include -#include #include #include #include @@ -60,7 +59,7 @@ #define MESSAGE_ID_WILLSEND 1 -const value_string ldss_message_id_value[] = { +static const value_string ldss_message_id_value[] = { { MESSAGE_ID_NEEDFILE, "Need file" }, { MESSAGE_ID_WILLSEND, "Will send" }, { 0, NULL } @@ -75,7 +74,7 @@ const value_string ldss_message_id_value[] = { #define INFERRED_NONE 5 /* Displayed in the info column */ -const value_string ldss_inferred_info[] = { +static const value_string ldss_inferred_info[] = { { INFERRED_PEERSHUTDOWN, " - peer shutting down" }, { INFERRED_SEARCH, " - search" }, { INFERRED_OFFER, " - offer" }, @@ -86,7 +85,7 @@ const value_string ldss_inferred_info[] = { }; /* Displayed in the tree as a generated item */ -const value_string ldss_inferred_value[] = { +static const value_string ldss_inferred_value[] = { { INFERRED_PEERSHUTDOWN, "Peer shutdown" }, { INFERRED_SEARCH, "File search" }, { INFERRED_OFFER, "File offer" }, @@ -103,7 +102,7 @@ const value_string ldss_inferred_value[] = { #define DIGEST_TYPE_SHA256 3 -const value_string ldss_digest_type_value[] = { +static const value_string ldss_digest_type_value[] = { { DIGEST_TYPE_UNKNOWN, "Unknown" }, { DIGEST_TYPE_MD5, "MD5" }, { DIGEST_TYPE_SHA1, "SHA1" }, @@ -116,7 +115,7 @@ const value_string ldss_digest_type_value[] = { #define COMPRESSION_GZIP 1 -const value_string ldss_compression_value[] = { +static const value_string ldss_compression_value[] = { { COMPRESSION_NONE, "None" }, { COMPRESSION_GZIP, "gzip" }, { 0, NULL } @@ -283,7 +282,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti, *ldss_tree; const gchar *packet_type, *packet_detail; - + messageID = tvb_get_ntohs (tvb, 0); digest_type = tvb_get_guint8 (tvb, 2); compression = tvb_get_guint8 (tvb, 3); @@ -294,7 +293,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) targetTime = tvb_get_ntohl (tvb, 56); port = tvb_get_ntohs (tvb, 64); rate = tvb_get_ntohs (tvb, 66); - + packet_type = val_to_str(messageID, ldss_message_id_value, "unknown"); if (messageID == MESSAGE_ID_WILLSEND) { @@ -330,7 +329,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) packet_type, packet_detail); } - + /* If we have a non-null tree (ie we are building the proto_tree * instead of just filling out the columns), then give more detail. */ if (tree) { @@ -500,7 +499,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) transfer_info->req->file = se_alloc0(sizeof(ldss_file_t)); highest_num_seen = pinfo->fd->num; } - + if (tree) { ti = proto_tree_add_item(tree, proto_ldss, tvb, 0, tvb_reported_length(tvb), FALSE); @@ -537,7 +536,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * There are too many locals to pass to a function - the signature * looked pretty ugly when I tried! */ is_digest_line = FALSE; - + if (strncmp(line,"md5:",4)==0) { is_digest_line = TRUE; digest_type_len = 4; @@ -595,7 +594,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(ti); } } - + if (is_digest_line) { /* Sample digest-type/digest line: * md5:0123456789ABCDEF\n */ @@ -757,7 +756,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Link the transfer back to the initiating broadcast. Response time is - * calculated as the time from broadcast to completed transfer. */ + * calculated as the time from broadcast to completed transfer. */ ti = proto_tree_add_uint(ldss_tree, hf_ldss_initiated_by, tvb, 0, 0, transfer_info->broadcast->num); PROTO_ITEM_SET_GENERATED(ti); @@ -824,7 +823,7 @@ ldss_init_protocol(void) highest_num_seen = 0; } -void +void proto_register_ldss (void) { static hf_register_info hf[] = { { &hf_ldss_message_id, @@ -872,70 +871,70 @@ proto_register_ldss (void) { { &hf_ldss_size, { "Size", "ldss.size", - FT_UINT64, BASE_DEC, NULL, 0x0, + FT_UINT64, BASE_DEC, NULL, 0x0, "Size of complete file", HFILL } }, { &hf_ldss_offset, { "Offset", "ldss.offset", - FT_UINT64, BASE_DEC, NULL, 0x0, + FT_UINT64, BASE_DEC, NULL, 0x0, "Size of currently available portion of file", HFILL } }, { &hf_ldss_target_time, { "Target time (relative)", "ldss.target_time", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, "Time until file will be needed/available", HFILL } }, { &hf_ldss_reserved_1, { "Reserved", "ldss.reserved_1", - FT_UINT32, BASE_HEX, NULL, 0x0, + FT_UINT32, BASE_HEX, NULL, 0x0, "Unused field - should be 0x00000000", HFILL } }, { &hf_ldss_port, { "Port", "ldss.port", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "TCP port for push (Need file) or pull (Will send)", HFILL } }, { &hf_ldss_rate, { "Rate (B/s)", "ldss.rate", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "Estimated current download rate", HFILL } }, { &hf_ldss_priority, { "Priority", "ldss.priority", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ldss_property_count, { "Property Count", "ldss.property_count", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ldss_properties, { "Properties", "ldss.properties", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ldss_file_data, { "File data", "ldss.file_data", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 9fd78245ca..c89d29c5df 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -227,7 +227,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r { 0, NULL } }; -const value_string format_vals[] = { +static const value_string format_vals[] = { { 0x81, "LLC basic format" }, { 0, NULL } }; @@ -237,7 +237,7 @@ const value_string format_vals[] = { */ #define TYPES_MASK 0x1F -const value_string type_vals[] = { +static const value_string type_vals[] = { { 1, "Type 1 LLC (Class I LLC)" }, { 2, "Type 2 LLC" }, { 3, "Type 1 and Type 2 LLCs (Class II LLC)" }, diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 91a99f9ca9..dbf6fe025f 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -31,8 +31,6 @@ # include "config.h" #endif -#include - #include #include @@ -457,7 +455,7 @@ static const value_string operational_mau_type_values[] = { #define MAX_MAC_LEN 6 -const value_string profinet_port2_status_vals[] = { +static const value_string profinet_port2_status_vals[] = { { 0, "OFF" }, { 1, "SYNCDATA_LOADED" }, { 2, "RTCLASS2_UP" }, @@ -466,7 +464,7 @@ const value_string profinet_port2_status_vals[] = { { 0, NULL } }; -const value_string profinet_port3_status_vals[] = { +static const value_string profinet_port3_status_vals[] = { { 0, "OFF" }, { 1, "IRDATA_LOADED" }, { 2, "RTCLASS3_UP" }, @@ -476,7 +474,7 @@ const value_string profinet_port3_status_vals[] = { { 0, NULL } }; -const value_string profinet_mrrt_port_status_vals[] = { +static const value_string profinet_mrrt_port_status_vals[] = { { 0, "OFF" }, { 1, "MRRT_CONFIGURED" }, { 2, "MRRT_UP" }, diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index fd8e50bc59..5f6505fd93 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -30,9 +30,6 @@ #include "config.h" #endif -#include -#include -#include #include #include #include @@ -94,6 +91,7 @@ typedef struct { guint16 length; } CNTL_Header; +#if 0 typedef enum { RESULT_CODE = 1, MWAR_ADDR_PAYLOAD, @@ -126,6 +124,7 @@ typedef enum { ADD_MOBILE_PAYLOAD, DELETE_MOBILE_PAYLOAD } control_tags; +#endif typedef enum { @@ -162,12 +161,12 @@ typedef enum KEY_UPDATE_RES, PRIMARY_DISCOVERY_REQ, PRIMARY_DISCOVERY_RES, - DATA_TRANSFER, - DATA_TRANSFER_RES, - RESET_REQ_CLEAR_CONFIG + DATA_TRANSFER, + DATA_TRANSFER_RES, + RESET_REQ_CLEAR_CONFIG }CNTLMsgType; -const value_string control_msg_vals[] = { +static const value_string control_msg_vals[] = { {DISCOVERY_REQUEST, "DISCOVERY_REQUEST"}, {DISCOVERY_REPLY, "DISCOVERY_REPLY"}, {JOIN_REQUEST, "JOIN_REQUEST"}, @@ -207,7 +206,8 @@ const value_string control_msg_vals[] = { { 0, NULL} }; -const value_string control_tag_vals[] = { +#if 0 +static const value_string control_tag_vals[] = { {RESULT_CODE, "RESULT_CODE"}, {MWAR_ADDR_PAYLOAD, "MWAR_ADDR_PAYLOAD"}, @@ -241,6 +241,7 @@ const value_string control_tag_vals[] = { {DELETE_MOBILE_PAYLOAD, "DELETE_MOBILE_PAYLOAD"}, {0, NULL} }; +#endif static const true_false_string lwapp_flags_type = { "LWAPP Control Packet" , @@ -249,10 +250,10 @@ static const true_false_string lwapp_flags_type = { static const true_false_string lwapp_set_truth = { "Not Set", - "Set" + "Set" }; -/* +/* * dissect lwapp control packets. This is not fully implemented, * but it's a good start. */ @@ -275,7 +276,7 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo, /* Copy our header */ tvb_memcpy(tvb, (guint8*) &header, offset, sizeof(header)); - /* + /* * Fix the length (network byte ordering), and set our version & * slot id */ @@ -293,16 +294,16 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo, ti = proto_tree_add_item(tree, proto_lwapp_control, tvb, offset, -1, FALSE); control_tree = proto_item_add_subtree(ti, ett_lwapp_control); - - proto_tree_add_uint(control_tree, hf_lwapp_control_type, + + proto_tree_add_uint(control_tree, hf_lwapp_control_type, tvb, offset, 1, header.type); offset++; - proto_tree_add_uint(control_tree, hf_lwapp_control_seq_no, + proto_tree_add_uint(control_tree, hf_lwapp_control_seq_no, tvb, offset, 1, header.seqNo); offset++; - proto_tree_add_uint(control_tree, hf_lwapp_control_length, + proto_tree_add_uint(control_tree, hf_lwapp_control_length, tvb, offset, 2, header.length); offset += 2; @@ -347,7 +348,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo, /* - * This dissector dissects the lwapp protocol itself. It assumes an + * This dissector dissects the lwapp protocol itself. It assumes an * lwapp payload in the data, and doesn't care whether the data was * from a UDP packet, or a Layer 2 one. */ @@ -377,7 +378,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, if (pinfo->destport == 12223 ) { tvb_memcpy(tvb, dest_mac, offset, 6); have_destmac = 1; - + /* Copy our header */ tvb_memcpy(tvb, (guint8*) &header, offset + 6, sizeof(header)); } else { @@ -387,7 +388,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, } - /* + /* * Fix the length (network byte ordering), and set our version & * slot id */ @@ -418,32 +419,32 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, offset += 6; } - proto_tree_add_uint(lwapp_tree, hf_lwapp_version, + proto_tree_add_uint(lwapp_tree, hf_lwapp_version, tvb, offset, 1, version); - proto_tree_add_uint(lwapp_tree, hf_lwapp_slotid, + proto_tree_add_uint(lwapp_tree, hf_lwapp_slotid, tvb, offset, 1, slotId); flags_tree = proto_item_add_subtree(lwapp_tree, ett_lwapp_flags); - proto_tree_add_boolean(flags_tree, hf_lwapp_flags_type, + proto_tree_add_boolean(flags_tree, hf_lwapp_flags_type, tvb, offset, 1, header.flags); - proto_tree_add_boolean(flags_tree, hf_lwapp_flags_fragment, + proto_tree_add_boolean(flags_tree, hf_lwapp_flags_fragment, tvb, offset, 1, header.flags); - proto_tree_add_boolean(flags_tree, hf_lwapp_flags_fragment_type, + proto_tree_add_boolean(flags_tree, hf_lwapp_flags_fragment_type, tvb, offset, 1, header.flags); offset++; - proto_tree_add_uint(lwapp_tree, hf_lwapp_fragment_id, + proto_tree_add_uint(lwapp_tree, hf_lwapp_fragment_id, tvb, offset, 1, header.fragmentId); offset++; - proto_tree_add_uint(lwapp_tree, hf_lwapp_length, + proto_tree_add_uint(lwapp_tree, hf_lwapp_length, tvb, offset, 2, header.length); offset += 2; - proto_tree_add_uint(lwapp_tree, hf_lwapp_rssi, + proto_tree_add_uint(lwapp_tree, hf_lwapp_rssi, tvb, offset, 1, header.rssi); offset++; - proto_tree_add_uint(lwapp_tree, hf_lwapp_snr, + proto_tree_add_uint(lwapp_tree, hf_lwapp_snr, tvb, offset, 1, header.snr); offset++; @@ -473,7 +474,7 @@ proto_register_lwapp(void) { "slotId","lwapp.slotId", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_lwapp_flags_type, - { "Type", "lwapp.flags.type", FT_BOOLEAN, 8, + { "Type", "lwapp.flags.type", FT_BOOLEAN, 8, TFS(&lwapp_flags_type), LWAPP_FLAGS_T, NULL, HFILL }}, { &hf_lwapp_flags_fragment, { "Fragment", "lwapp.flags.fragment", FT_BOOLEAN, 8, @@ -519,13 +520,13 @@ proto_register_lwapp(void) }; module_t *lwapp_module; - proto_lwapp = proto_register_protocol ("LWAPP Encapsulated Packet", + proto_lwapp = proto_register_protocol ("LWAPP Encapsulated Packet", "LWAPP", "lwapp"); - proto_lwapp_l3 = proto_register_protocol ("LWAPP Layer 3 Packet", + proto_lwapp_l3 = proto_register_protocol ("LWAPP Layer 3 Packet", "LWAPP-L3", "lwapp-l3"); - proto_lwapp_control = proto_register_protocol ("LWAPP Control Message", + proto_lwapp_control = proto_register_protocol ("LWAPP Control Message", "LWAPP-CNTL", "lwapp-cntl"); proto_register_field_array(proto_lwapp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -559,19 +560,19 @@ proto_reg_handoff_lwapp(void) lwapp_handle = create_dissector_handle(dissect_lwapp, proto_lwapp); /* - * Ok, the following deserves some comments. We have four + * Ok, the following deserves some comments. We have four * different ways lwapp can appear on the wire. Mostly, this is * because lwapp is such a new protocol. - * + * * First, lwapp can join on multiple udp ports, as encapsulated * packets on top of UDP. In this case, there is a full raw - * ethernet frame inside of the UDP packet. This method is - * becoming obscelete, but we still wanted to dissect the + * ethernet frame inside of the UDP packet. This method is + * becoming obscelete, but we still wanted to dissect the * packets. * * Next, lwapp can be over UDP, but packged for L3 tunneling. This * is the new-style. In this case, LWAP headers are just transmitted - * via UDP. + * via UDP. * * The last method is lwapp directly over layer 2. For this, we * dissect two different ethertypes (until IANA gives us one) diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index f97cdbfe95..c69a2a5792 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -35,7 +35,7 @@ #include "packet-sscop.h" #include "wiretap/erf.h" -int proto_meta = -1; +static int proto_meta = -1; extern int proto_sscop; extern int proto_malformed; diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 83e32ab8c1..9d26c65811 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -39,8 +39,6 @@ # include "config.h" #endif -#include - #include #include @@ -54,8 +52,6 @@ #include #endif /* HAVE_LIBGCRYPT */ -#include "packet-mikey.h" - #define PORT_MIKEY 2269 static guint global_mikey_tcp_port = PORT_MIKEY; @@ -1242,7 +1238,7 @@ dissect_payload(enum payload_t payload, mikey_t *mikey, tvbuff_t *tvb, packet_in } /* MIKEY dissector */ -int +static int dissect_mikey(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti = NULL; diff --git a/epan/dissectors/packet-mikey.h b/epan/dissectors/packet-mikey.h deleted file mode 100644 index f6e44ae060..0000000000 --- a/epan/dissectors/packet-mikey.h +++ /dev/null @@ -1,34 +0,0 @@ -/* packet-mikey.h - * Routines for Multimedia Internet KEYing dissection - * Copyright 2007, Mikael Magnusson - * - * $Id$ - * - * Copyright (c) 2003 by Erwin Rol - * Copyright (c) 2006 by Electronic Theatre Controls, Inc. - * Bill Florac - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * Copyright 1999 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -#ifndef __PACKET_MIKEY_H__ -#define __PACKET_MIKEY_H__ -int -dissect_mikey(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); - -#endif /* define __PACKET_MIKEY_H__ */ diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index f9b76fc90e..94697e68f1 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -643,7 +643,7 @@ static dissector_table_t ip_dissector_table; /* Initialize the protocol and registered header fields */ static int proto_mip6 = -1; -int proto_nemo = -1; +static int proto_nemo = -1; static int hf_mip6_proto = -1; static int hf_mip6_hlen = -1; static int hf_mip6_mhtype = -1; diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index f0a6fdef03..21a12bbda1 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -111,8 +111,8 @@ typedef enum { JAPAN_PC_STRUCTURE_3_4_4_5 = 3 } JAPAN_PC_Structure_Type; -gint itu_pc_structure = ITU_PC_STRUCTURE_NONE; -gint japan_pc_structure = JAPAN_PC_STRUCTURE_NONE; +static gint itu_pc_structure = ITU_PC_STRUCTURE_NONE; +static gint japan_pc_structure = JAPAN_PC_STRUCTURE_NONE; #include gint mtp3_standard = ITU_STANDARD; -- cgit v1.2.3