diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-10-23 06:29:11 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-10-23 06:29:11 +0000 |
commit | 9874da2fcbfb61cd86efd7d60041b6231a088a7f (patch) | |
tree | bd137e552635dd9e24c3e113a02e7db71251f831 | |
parent | dd314cd97e442decbd8cc0e4bcfd57159ec94bcb (diff) | |
download | wireshark-9874da2fcbfb61cd86efd7d60041b6231a088a7f.tar.gz wireshark-9874da2fcbfb61cd86efd7d60041b6231a088a7f.tar.bz2 wireshark-9874da2fcbfb61cd86efd7d60041b6231a088a7f.zip |
#if 0 numerous "unused const variables" (mostly value-string-arrays);
Also; fix a few "set but not used" warnings.
svn path=/trunk/; revision=52780
73 files changed, 199 insertions, 12 deletions
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index c5b290fdd0..cce340ec9e 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -464,6 +464,7 @@ static const value_string a11_ext_app[]= { {0, NULL}, }; +#if 0 static const value_string a11_airlink_types[]= { {1, "Session Setup (Y=1)"}, {2, "Active Start (Y=2)"}, @@ -471,6 +472,7 @@ static const value_string a11_airlink_types[]= { {4, "Short Data Burst (Y=4)"}, {0, NULL}, }; +#endif static const true_false_string tfs_included_not_included = { "Included", "Not Included" }; diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index 5f141b72b2..a57aceb919 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -2074,7 +2074,9 @@ static const value_string valstr_008_040_FST_LST[] = { static const FieldPart I008_040_ORG = { 1, 1.0, FIELD_PART_UINT, &hf_008_040_ORG, NULL }; static const FieldPart I008_040_INT = { 3, 1.0, FIELD_PART_UINT, &hf_008_040_INT, NULL }; static const FieldPart I008_040_FST_LST = { 2, 1.0, FIELD_PART_UINT, &hf_008_040_FST_LST, NULL }; +#if 0 static const FieldPart I008_040_CSN = { 8, 1.0, FIELD_PART_UINT, &hf_008_040_CSN, NULL }; +#endif static const FieldPart *I008_040_PARTS[] = { &I008_040_ORG, &I008_040_INT, &IXXX_2bit_spare, &I008_040_FST_LST, &I008_040_FST_LST, NULL }; @@ -3619,6 +3621,7 @@ static const value_string valstr_062_380_09_PTYP[] = { { 11, "Transition altitude" }, { 0, NULL } }; +#if 0 static const value_string valstr_062_380_09_TD[] = { { 0, "N/A" }, { 1, "Turn right" }, @@ -3626,6 +3629,7 @@ static const value_string valstr_062_380_09_TD[] = { { 3, "No turn" }, { 0, NULL } }; +#endif static const value_string valstr_062_380_09_TRA[] = { { 0, "TTR not available" }, { 1, "TTR available" }, diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 5349f527ba..c8cb5fbd07 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -2616,12 +2616,14 @@ BACnetLifeSafetyOperation [] = { procedures and constraints described in Clause 23. */ }; +#if 0 static const value_string BACnetLimitEnable [] = { { 0, "lowLimitEnable"}, { 1, "highLimitEnable"}, { 0, NULL} }; +#endif static const value_string BACnetLifeSafetyState [] = { @@ -2725,6 +2727,7 @@ BACnetUnconfirmedServiceChoice [] = { { 0, NULL} }; +#if 0 static const value_string BACnetUnconfirmedServiceRequest [] = { { 0, "i-Am-Request"}, @@ -2739,6 +2742,7 @@ BACnetUnconfirmedServiceRequest [] = { { 9, "utcTimeSynchonization-Request"}, { 0, NULL} }; +#endif static const value_string BACnetObjectType [] = { @@ -5038,11 +5042,11 @@ static const fragment_items msg_frag_items = { "Message fragments" }; +#if 0 /* if BACnet uses the reserved values, then patch the corresponding values here, maximum 16 values are defined */ +/* FIXME: fGetMaxAPDUSize is commented out, as it is not used. It was used to set variables which were not later used. */ static const guint MaxAPDUSize [] = { 50, 128, 206, 480, 1024, 1476 }; -#if 0 -/* FIXME: fGetMaxAPDUSize is commented out, as it is not used. It was used to set variables which were not later used. */ static guint fGetMaxAPDUSize(guint8 idx) { diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 607b170cd1..1fb8560db6 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -262,6 +262,7 @@ static const value_string ber_uni_tag_codes[] = { }; static value_string_ext ber_uni_tag_codes_ext = VALUE_STRING_EXT_INIT(ber_uni_tag_codes); +#if 0 static const true_false_string ber_real_binary_vals = { "Binary encoding", "Decimal encoding" @@ -271,6 +272,7 @@ static const true_false_string ber_real_decimal_vals = { "SpecialRealValue", "Decimal encoding " }; +#endif typedef struct _da_data { GHFunc func; diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index ac9dc8b9d5..df18cf9214 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -557,6 +557,7 @@ static guint16 de_bssgp_ran_inf_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, static guint16 de_bssgp_ran_inf_app_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_); +#if 0 static const value_string tab_nacc_cause[]={ { 0x00, "Other unspecified error" }, { 0x01, "Syntax error in the Application Container" }, @@ -567,6 +568,7 @@ static const value_string tab_nacc_cause[]={ { 0, NULL }, }; +#endif /* diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index be12e1ea9c..282dc2c36f 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -111,6 +111,7 @@ static const value_string status_vals[] = { { 0, NULL } }; +#if 0 static const value_string create_status_vals[] = { { 0x0000, "Success" }, { 0x0001, "Invalid Controller ID" }, @@ -127,6 +128,7 @@ static const value_string disc_status_vals[] = { { 0x0002, "Failed - No Physical Link exists and no Physical Link creation is in progress" }, { 0, NULL } }; +#endif void proto_register_btamp(void); void proto_reg_handoff_btamp(void); diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 0395eed73e..e568ec210c 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1563,7 +1563,7 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (payload_type == 0xff) { /* CAPWAP Keep-Alive Payload */ - offset += dissect_capwap_data_keep_alive(next_tvb, pinfo, capwap_data_tree, 0); + /*offset +=*/ dissect_capwap_data_keep_alive(next_tvb, pinfo, capwap_data_tree, 0); } else { diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 7f5a40dc11..68fcea38a5 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -1951,6 +1951,7 @@ static int hf_cigi3_3_symbol_line_definition_stipple_pattern_length = -1; static int hf_cigi3_3_symbol_line_definition_vertex_u[] = {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}; static int hf_cigi3_3_symbol_line_definition_vertex_v[] = {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}; +#if 0 static const value_string cigi3_3_symbol_line_definition_primitive_type_vals[] = { {0, "Point"}, {1, "Line"}, @@ -1961,6 +1962,7 @@ static const value_string cigi3_3_symbol_line_definition_primitive_type_vals[] = {6, "Triangle Fan"}, {0, NULL} }; +#endif /* CIGI3_3 Symbol Clone */ #define CIGI3_PACKET_SIZE_SYMBOL_CLONE_DEFINITION 8 diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 12f7323040..7d0db56da1 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -88,10 +88,12 @@ static gboolean cops_desegment = TRUE; #define COPS_OBJECT_HDR_SIZE 4 +#if 0 /* Null string of type "guchar[]". */ static const guchar nullstring[] = ""; #define SAFE_STRING(s) (((s) != NULL) ? (s) : nullstring) +#endif static const value_string cops_flags_vals[] = { { 0x00, "None" }, diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index ba300d036d..0d0b2d8337 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -74,6 +74,7 @@ static gint ett_cphap = -1; #define UDP_PORT_CPHA 8116 #define CPHA_MAGIC 0x1A90 +#if 0 static const value_string opcode_type_short_vals[] = { { 0, "Unknown" }, { 1, "FWHA_MY_STATE" }, @@ -88,6 +89,7 @@ static const value_string opcode_type_short_vals[] = { { 10, "FWHAP_SYNC" }, { 0, NULL } }; +#endif static const value_string opcode_type_vals[] = { { 0, "Unknown OpCode" }, diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index c5b75c5162..7495f6cbd9 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -238,8 +238,10 @@ static const e_uuid_t ipid_rem_unknown = { 0x00000131, 0x1234, 0x5678, { 0xCA, static const e_uuid_t iid_unknown = { 0x00000000, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; static const e_uuid_t uuid_null = { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; static const e_uuid_t iid_class_factory = { 0x00000001, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +#if 0 static const e_uuid_t iid_act_prop_in = { 0x000001A2, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; static const e_uuid_t iid_act_prop_out = { 0x000001A3, 0x0000, 0x0000, { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }; +#endif static GList *dcom_machines = NULL; static GList *dcom_interfaces = NULL; @@ -251,11 +253,13 @@ static const value_string dcom_thisthat_flag_vals[] = { { 0, NULL } }; +#if 0 static const value_string dcom_boolean_flag_vals[] = { { 0x00000001, "TRUE" }, { 0x00000000, "FALSE" }, { 0, NULL } }; +#endif void dcom_interface_dump(void) { dcom_machine_t *machine; diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index e6dc811492..a064c3193a 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1125,6 +1125,7 @@ static const value_string PTInfoType_vals[]= {0, NULL} }; +#if 0 /* ETSI EN 300 175-3 V2.3.0 7.2.4.3.10 */ static const value_string PTRFPPower_vals[]= { @@ -1146,6 +1147,7 @@ static const value_string PTRFPPower_vals[]= {15, "30 dBm"}, {0, NULL} }; +#endif static unsigned char diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index f55273f866..a3bd95892b 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -587,11 +587,13 @@ static const value_string pkt_cccV6_opt_vals[] = { { 0, NULL } }; +#if 0 static const value_string sec_tcm_vals[] = { { 1 << 0, "PacketCable Provisioning Server" }, { 1 << 1, "PacketCable Call Manager Servers" }, { 0, NULL }, }; +#endif static const value_string modem_capabilities_encoding [] = { { 1, "Concatenation Support" }, diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c index f7f3fd8b47..bd34a59140 100644 --- a/epan/dissectors/packet-dvb-bat.c +++ b/epan/dissectors/packet-dvb-bat.c @@ -80,6 +80,7 @@ static const value_string dvb_bat_cur_next_vals[] = { { 0, NULL } }; +#if 0 static const value_string dvb_bat_running_status_vals[] = { { 0, "Undefined" }, { 1, "Not Running" }, @@ -97,6 +98,7 @@ static const value_string dvb_bat_free_ca_mode_vals[] = { { 0, NULL } }; +#endif static void dissect_dvb_bat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index a80f7b4ceb..8c033452be 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -459,6 +459,7 @@ static const value_string abts_ack_vals[] = { {0x000030, "ABTS - Imm Seq Retx"}, {0,NULL} }; +#if 0 static const value_string abts_not_ack_vals[] = { {0x000000, "ABTS - Abort/MS"}, {0x000010, "ABTS - Abort/SS"}, @@ -466,6 +467,7 @@ static const value_string abts_not_ack_vals[] = { {0x000030, "ABTS - Discard/MS/Imm Retx"}, {0,NULL} }; +#endif static const value_string last_data_frame_vals[] = { {0x000000, "Last Data Frame - No Info"}, {0x004000, "Last Data Frame - Seq Imm"}, diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 01e71940b1..a1a276b579 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -1434,13 +1434,14 @@ static gint ett_ff_lr_diagnostic_msg_req_b_to_b_status = -1; +#if 0 static const value_string names_pad_len[] = { { 0x00, "No padding" }, { OPTION_PAD_4BYTE, "pad to 4 byte boundary" }, { OPTION_PAD_8BYTE, "pad to 8 byte boundary" }, { 0, NULL } }; - +#endif static const value_string names_proto[] = { diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 9465b20791..f74a511121 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -81,6 +81,7 @@ static int hf_flip_chksum_chksum = -1; #define FLIP_CHKSUM_HDR_LEN (4) #define FLIP_EXTENSION_HDR_MIN_LEN (4) +#if 0 static const value_string flip_short_header_names[]={ { FLIP_BASIC, "BASIC" }, { FLIP_CHKSUM, "CHKSUM"}, @@ -92,6 +93,7 @@ static const value_string flip_long_header_names[] = { { FLIP_CHKSUM, "Checksum"}, { 0, NULL } }; +#endif static const value_string flip_boolean[] = { {0, "No"}, diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c index 6182bbf5b4..f55d35e84b 100644 --- a/epan/dissectors/packet-ged125.c +++ b/epan/dissectors/packet-ged125.c @@ -389,6 +389,7 @@ static const value_string status_code_trunk_status[] = { { 0, NULL} }; +#if 0 /*Label values*/ static const value_string vals_status_code_label_values[] = { { 0x1, "NORMAL"}, @@ -397,6 +398,7 @@ static const value_string vals_status_code_label_values[] = { { 0x5, "DEFAULT"}, { 0, NULL} }; +#endif /*Service Control Message Sub-values*/ static const value_string vals_service_control_message_subvalues[] = { diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 4f23e481e3..24962a33f3 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -411,6 +411,7 @@ static const value_string gsm_a_be_cell_id_disc_vals[] = { }; static value_string_ext gsm_a_be_cell_id_disc_vals_ext = VALUE_STRING_EXT_INIT(gsm_a_be_cell_id_disc_vals); +#if 0 static const value_string gsm_a_rr_channel_needed_vals[] = { { 0x00, "Any channel"}, { 0x01, "SDCCH"}, @@ -418,6 +419,7 @@ static const value_string gsm_a_rr_channel_needed_vals[] = { { 0x03, "TCH/H or TCH/F (Dual rate)"}, { 0, NULL } }; +#endif static const value_string bssmap_positioning_methods[] = { { 0, "Timing Advance" }, @@ -1619,10 +1621,12 @@ be_periodicity(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 /* * 3.2.2.13 Extended Resource Indicator */ +#if 0 static const true_false_string bssmap_tarr_vals = { "The total number of accessible channels is requested", "No extra Resource Information is requested" }; +#endif static guint16 be_ext_res_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { @@ -3241,6 +3245,7 @@ be_seg(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, /* * 3.2.2.75 Service Handover */ +#if 0 static const value_string gsm_a_bssmap_serv_ho_inf_vals[] = { { 0, "Handover to UTRAN or cdma2000 should be performed - Handover to UTRAN or cdma2000 is preferred" }, { 1, "Handover to UTRAN or cdma2000 should not be performed - Handover to GSM is preferred" }, @@ -3252,6 +3257,7 @@ static const value_string gsm_a_bssmap_serv_ho_inf_vals[] = { { 7, "no information available for service based handover" }, { 0, NULL } }; +#endif static guint16 be_serv_ho(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 56c1a31402..e031e03826 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -995,10 +995,12 @@ static const true_false_string gsm_a_gmm_net_cap_smgprs_vals = { "Mobile station does not support mobile terminated point to point SMS via GPRS packet data channels" }; +#if 0 static const true_false_string gsm_a_gmm_net_cap_ucs2_vals = { "The ME has no preference between the use of the default alphabet and the use of UCS2", "The ME has a preference for the default alphabet (defined in 3GPP TS 23.038 [8b]) over UCS2" }; +#endif static const value_string gsm_a_gmm_net_cap_ss_scr_ind_vals[]={ { 0x00, "Default value of phase 1" }, diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 7bb30eb848..2637363490 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -4461,11 +4461,13 @@ static const value_string gsm_a_rr_cell_barr_access_vals[] = { { 1, "The cell is barred"}, { 0, NULL } }; +#if 0 static const value_string gsm_a_rr_re_vals[] = { { 0, "Call Reestablishment allowed in the cell"}, { 1, "Call Reestablishment not allowed in the cell"}, { 0, NULL } }; +#endif static guint16 de_rr_rach_ctrl_param(tvbuff_t *tvb, proto_tree *subtree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) @@ -5377,10 +5379,12 @@ static const true_false_string eutran_ccn_active = { "The broadcast E-UTRAN_CCN_ACTIVE parameter shall apply if applicable. Otherwise, CCN towards E-UTRAN cells is disabled in the cell" }; +#if 0 static const true_false_string eutran_rep_quant = { "RSRQ", "RSRP" }; +#endif static const value_string gsm_a_rr_pcid_psc_pattern_length[] = { { 0, "1"}, @@ -7551,6 +7555,7 @@ static const true_false_string gsm_a_rr_si_status_ind_value = { "The network does not support the PACKET SI STATUS message" }; +#if 0 static const value_string gsm_a_rr_lb_ms_txpwr_max_cch_vals[] = { { 0, "43 dBm"}, { 1, "41 dBm"}, @@ -7586,6 +7591,7 @@ static const value_string gsm_a_rr_lb_ms_txpwr_max_cch_vals[] = { { 31, "5 dBm"}, { 0, NULL } }; +#endif static const value_string gsm_a_rr_si2n_support_vals[] = { { 0, "SI2n is not supported"}, diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index ec432909d6..080f8c7779 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -511,6 +511,7 @@ enum abis_nm_pcause_type { NM_PCAUSE_T_MANUF = 0x03 }; +#if 0 /* Section 9.4.36: NACK Causes */ enum abis_nm_nack_cause { /* General Nack Causes */ @@ -548,6 +549,7 @@ enum abis_nm_nack_cause { NM_NACK_MEAS_NOTSUPP = 0x2b, NM_NACK_MEAS_NOTSTART = 0x2c }; +#endif /* Section 9.4.1 */ struct abis_nm_channel { @@ -1272,6 +1274,7 @@ static const value_string oml_severity_vals[] = { { 0, NULL } }; +#if 0 /* Section 9.4.36: NACK Causes */ static const value_string oml_nack_cause[] = { { NM_NACK_INCORR_STRUCT, "Incorrect message structure" }, @@ -1309,6 +1312,7 @@ static const value_string oml_nack_cause[] = { { 0xff, "NULL" }, { 0, NULL } }; +#endif static const value_string oml_test_no_vals[] = { { NM_IPACC_TESTNO_RLOOP_ANT, "Radio Loop test via antenna" }, diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 235ca2919a..2538a99cd4 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -4188,12 +4188,14 @@ dissect_gtpv2_selec_mode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* * 8.59 Source Identification */ +#if 0 static const value_string gtpv2_source_ident_types[] = { {0, "Cell ID"}, {1, "RNC ID"}, {2, "eNodeB ID(Reserved, used in erlier v of proto.)"}, {0, NULL} }; +#endif static void dissect_gtpv2_source_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) { @@ -4287,13 +4289,14 @@ dissect_gtpv2_cng_rep_act(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre /* * 8.62 Fully qualified PDN Connection Set Identifier (FQ-CSID) */ +#if 0 static const value_string gtpv2_fq_csid_type_vals[] = { {0, "Global unicast IPv4 address"}, {1, "Global unicast IPv6 address"}, {2, "4 octets long field"}, {0, NULL} }; - +#endif void dissect_gtpv2_fq_csid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 342bc31706..46ce56ba42 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -88,6 +88,7 @@ static const value_string opcode_names[] = { { 0, NULL } }; +#if 0 static const value_string opcode_short_names[] = { { 0x02, "Disc_Ping" }, { 0x03, "Disc_Pong" }, @@ -104,6 +105,7 @@ static const value_string opcode_short_names[] = { { 0x87, "Blk_Wr_Ans" }, { 0, NULL } }; +#endif static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index 361297e8f2..346d400f9a 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.c @@ -387,10 +387,12 @@ static const value_string h248_pkg_dg_signals_vals[] = { {0,NULL} }; +#if 0 static const value_string h248_pkg_dg_sig_params_vals[] = { { 0x0001, "Tone Direction (btd)" }, { 0, NULL } }; +#endif static const value_string h248_pkg_dg_sig_btd_vals[] = { { 0x0001, "External (EXT)" }, diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index d7a8e359d7..a1b3d72736 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -221,10 +221,12 @@ static const true_false_string h264_end_bit_vals = { "Not the last packet of FU-A picture" }; +#if 0 static const true_false_string h264_forbidden_bit_vals = { "Forbidden Bit of FU-A", "Not Forbidden Bit of FU-A" }; +#endif #define H264_SEQ_PAR_SET 7 #define H264_PIC_PAR_SET 8 diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index 64e9f72008..3ceea4d5b9 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -54,9 +54,11 @@ #define SECOND_READ_FRAGMENT_LEN 29 +#if 0 static const int START = 0; static const int AUTHENTICATION = 1; static const int DATA = 2; +#endif static guint tcp_port = 0; diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index fab9beb2d2..f0d72d9689 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -61,9 +61,11 @@ #define CHUNKSIZE_START 3 +#if 0 static const int RESPONSE_HEADER = 1; static const int RESPONSE_METADATA = 2; static const int RESPONSE_DATA = 3; +#endif static guint tcp_port = 0; diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index baf96798c5..aed38fc9c0 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -266,6 +266,7 @@ static const value_string notification_vals[] = { { 0, NULL } }; +#if 0 /* RFC 5770 */ static const value_string nat_traversal_mode_vals[] = { { 0, "Reserved"}, @@ -273,6 +274,7 @@ static const value_string nat_traversal_mode_vals[] = { { 2, "ICE-STUN-UDP"}, { 0, NULL } }; +#endif /* HIPv2 draft-ietf-hip-rfc5201-bis-08 Section 5.2 */ static const value_string cipher_vals[] = { diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 96cc8a9152..8bed6e7840 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -341,6 +341,7 @@ static const value_string clientCmdCode[] = { { 0, NULL } }; +#if 0 static const value_string group_vals[] = { { 1, "Name" }, { 2, "General" }, @@ -355,6 +356,7 @@ static const value_string group_vals[] = { { 11, "Women want men" }, { 0, NULL } }; +#endif /* * All ICQv5 decryption code thanx to Sebastien Dault (daus01@gel.usherb.ca) diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 665c873070..e46cfc60eb 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -1461,6 +1461,7 @@ static const value_string aem_memory_object_type_vals [] = { {0, NULL} }; +#if 0 static const value_string aem_stream_format_subtype_vals [] = { {IEC_61883_IIDC_SUBTYPE, "IEC_61883_IIDC_SUBTYPE"}, {MMA_SUBTYPE, "MMA_SUBTYPE"}, @@ -1491,6 +1492,7 @@ static const value_string aem_mfd_type_vals [] = { {MFD_TYPE_CONTROL_PROTO, "CONTROL_PROTOCOL"}, {0, NULL} }; +#endif static const value_string aem_clock_source_type_vals [] = { {AEM_CLOCK_INTERNAL , "INTERNAL"}, @@ -1643,12 +1645,14 @@ static const value_string aem_control_type_vals [] = { }; */ +#if 0 static const value_string aecp_address_type_vals [] = { {AECP_ADDRESS_MAC , "MAC"}, {AECP_ADDRESS_IPV4 , "IPV4"}, {AECP_ADDRESS_IPV6 , "IPV6"}, {0 , NULL} }; +#endif static const value_string aecp_keychain_id_type_vals [] = { {AECP_KEYCHAIN_NONE , "NONE"}, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 3072bc4dd8..a7f1ea3f5a 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -727,6 +727,7 @@ static const value_string transform_ike_attr_type[] = { { 0, NULL }, }; +#if 0 static const value_string vs_v2_sttr[] = { { 1, "SA-Life-Type" }, { 2, "SA-Life-Duration" }, @@ -740,6 +741,7 @@ static const value_string vs_v2_sttr[] = { { 10, "ECN Tunnel" }, { 0, NULL }, }; +#endif static const value_string vs_v1_trans_isakmp[] = { { 0, "RESERVED" }, @@ -885,12 +887,14 @@ static const value_string transform_attr_ext_seq_nbr_type[] = { { 0, NULL }, }; +#if 0 static const value_string transform_attr_sig_enco_algo_type[] = { { 0, "RESERVED" }, { 1, "RSASSA-PKCS1-v1_5" }, { 2, "RSASSA-PSS" }, { 0, NULL }, }; +#endif static const value_string transform_attr_addr_preservation_type[] = { { 0, "Reserved" }, diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 78013386fa..234ee17dcb 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -2232,6 +2232,7 @@ static const value_string isup_carrier_info_poihie_value[] = { { CARRIER_INFO_POIHIE_HIE2, "Hierarchy level 2"}, { 0,NULL}}; +#if 0 /* POICA */ /* ODD/EVEN */ #define CARRIER_INFO_CA_OE_0 0 @@ -2240,7 +2241,9 @@ static const value_string isup_carrier_info_poica_oe_value[] = { { CARRIER_INFO_CA_OE_0, "Reserved"}, { CARRIER_INFO_CA_OE_1, "Odd number of charge area digits"}, { 0,NULL}}; +#endif +#if 0 /* CARID */ /* ODD/EVEN */ #define CARRIER_INFO_CARID_OE_0 0 @@ -2249,6 +2252,7 @@ static const value_string isup_carrier_info_carid_oe_value[] = { { CARRIER_INFO_CARID_OE_0, "Even number of ID code digits"}, { CARRIER_INFO_CARID_OE_1, "Odd number of ID code digits"}, { 0,NULL}}; +#endif /* CARRIER INFORMATION DIGITS */ #define CARRIER_INFO_DIGIT_0 0 @@ -2277,6 +2281,7 @@ static const value_string isup_carrier_info_digits_value[] = { /*******************************/ /* CHARGE AREA INFORMATION */ /*******************************/ +#if 0 /* ODD/EVEN */ #define CHARGE_AREA_INFO_OE_0 0 #define CHARGE_AREA_INFO_OE_1 1 @@ -2284,6 +2289,7 @@ static const value_string isup_charge_area_info_oe_value[] = { { CHARGE_AREA_INFO_OE_0, "Even number of Charge Area digits"}, { CHARGE_AREA_INFO_OE_1, "Odd number of Charge Area code digits"}, { 0,NULL}}; +#endif #define CHARGE_AREA_NAT_INFO_MA 0 #define CHARGE_AREA_NAT_INFO_CA 1 @@ -4295,6 +4301,7 @@ static const value_string ETSI_codec_type_subfield_vals[] = { }; static value_string_ext ETSI_codec_type_subfield_vals_ext = VALUE_STRING_EXT_INIT(ETSI_codec_type_subfield_vals); +#if 0 static const value_string bat_initial_codec_mode_vals[] = { {0x7, "12.2 kbps"}, {0x6, "10.2 kbps"}, @@ -4306,6 +4313,7 @@ static const value_string bat_initial_codec_mode_vals[] = { {0x0, "4.75 kbps"}, {0, NULL} }; +#endif static const value_string optimisation_mode_vals[] = { { 0, "Optimisation of the ACS not supported,"}, diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index d96dbe1c1c..4a2a5a2400 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -672,10 +672,12 @@ static const true_false_string fec_vc_cbit = { "Control Word NOT Present" }; +#if 0 static const true_false_string fec_vc_ = { "Control Word Present", "Control Word NOT Present" }; +#endif static const value_string tlv_atm_merge_vals[] = { {0, "Merge not supported"}, diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index f7f5de0727..e0d2ef9b79 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -1297,6 +1297,7 @@ static const value_string mbim_phonebook_write_flag_vals[] = { { 0, NULL} }; +#if 0 static const value_string mbim_stk_pac_profile_vals[] = { { 0, "Not Handled By Function Cannot Be Handled By Host"}, { 1, "Not Handled By Function May Be Handled By Host"}, @@ -1308,6 +1309,7 @@ static const value_string mbim_stk_pac_profile_vals[] = { { 7, "Handled ByHostFunction Able To Handle"}, { 0, NULL} }; +#endif static const value_string mbim_stk_pac_type_vals[] = { { 0, "Proactive Command"}, diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 958b7dd273..e5b065bc50 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -411,6 +411,7 @@ static const value_string mip_cvse_verizon_cvse_types[]= { }; /*http://www.3gpp2.org/public_html/X/VSA-VSE.cfm*/ +#if 0 static const value_string mip_cvse_3gpp2_cvse_types[]= { {257, "Accounting/Radius"}, {258, "Accounting/Diameter"}, @@ -421,6 +422,7 @@ static const value_string mip_cvse_3gpp2_cvse_types[]= { {1537, "GRE Tunnel Endpoint Extension"}, {0, NULL} }; +#endif static const value_string mip_nvse_3gpp2_type_vals[]= { diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 5d970cd3a0..b2d03f9b51 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -585,6 +585,7 @@ static const value_string pmip6_bri_status[] = { { 0, NULL}, }; +#if 0 /* Handoff Indicator values */ static const range_string handoff_indicator[] = { { 0x00, 0x00, "Reserved" }, @@ -596,6 +597,7 @@ static const range_string handoff_indicator[] = { { 0x06, 0xff, "Unassigned" }, { 0, 0, NULL } }; +#endif /* Mobile Node Group Identifier Type * http://www.iana.org/assignments/mobility-parameters/mobility-parameters.xml#mobile-node-group-id-type diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index 442112bb0e..68fc45c644 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -124,6 +124,7 @@ static const value_string element_type_vals[] = { #define BSON_ELEMENT_BINARY_TYPE_MD5 4 #define BSON_ELEMENT_BINARY_TYPE_USER 128 /* 0x80 */ +#if 0 static const value_string binary_type_vals[] = { { BSON_ELEMENT_BINARY_TYPE_GENERIC, "Generic" }, { BSON_ELEMENT_BINARY_TYPE_FUNCTION, "Function" }, @@ -133,6 +134,7 @@ static const value_string binary_type_vals[] = { { BSON_ELEMENT_BINARY_TYPE_USER, "User" }, { 0, NULL } }; +#endif void proto_reg_handoff_mongo(void); diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index a4ef8fd12e..b0b839a2d7 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -1076,6 +1076,7 @@ static const value_string mpeg_descr_linkage_linkage_type_vals[] = { }; static value_string_ext mpeg_descr_linkage_linkage_type_vals_ext = VALUE_STRING_EXT_INIT(mpeg_descr_linkage_linkage_type_vals); +#if 0 static const value_string mpeg_descr_linkage_hand_over_type_vals[] = { { 0x01, "DVB hand-over to an identical service in a neighbouring country" }, { 0x02, "DVB hand-over to a local variation of the same service" }, @@ -1083,6 +1084,7 @@ static const value_string mpeg_descr_linkage_hand_over_type_vals[] = { { 0x00, NULL } }; +#endif static const value_string mpeg_descr_linkage_origin_type_vals[] = { { 0x0, "NIT" }, diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 98ec155a60..75abab63c1 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -391,12 +391,14 @@ static value_string_ext mpls_echo_tlv_fec_names_ext = VALUE_STRING_EXT_INIT(mpls #define TLV_FEC_LABEL_STACK 2 #define TLV_FEC_STACK_CHANGE 3 +#if 0 static const value_string mpls_echo_subtlv_names[] = { { TLV_FEC_MULTIPATH_DATA, "Multipath data"}, { TLV_FEC_LABEL_STACK, "Label stack"}, { TLV_FEC_STACK_CHANGE, "FEC stack change"}, { 0, NULL} }; +#endif /* [RFC 6424] */ #define TLV_MULTIPATH_NO_MULTIPATH 0 @@ -405,6 +407,7 @@ static const value_string mpls_echo_subtlv_names[] = { #define TLV_MULTIPATH_BIT_MASKED_IP 8 #define TLV_MULTIPATH_BIT_MASKED_LABEL_SET 9 +#if 0 static const value_string mpls_echo_multipathtlv_type[] = { { TLV_MULTIPATH_NO_MULTIPATH, "Empty (Multipath Length = 0)"}, { TLV_MULTIPATH_IP_ADDRESS, "IP addresses"}, @@ -413,6 +416,7 @@ static const value_string mpls_echo_multipathtlv_type[] = { { TLV_MULTIPATH_BIT_MASKED_LABEL_SET, "Label prefix and bit mask"}, { 0, NULL} }; +#endif /* [RFC 6424] */ #define SUB_TLV_FEC_PUSH 1 diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index 6736499fa8..bc98ed3e7e 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -99,11 +99,13 @@ static int proto_mux27010 = -1; /* Handles of subdissectors */ static dissector_handle_t ppp_handle; +#if 0 static const value_string packettypenames[] = { { 0, "TEXT" }, { 1, "SOMETHING_ELSE" }, { 0, NULL } }; +#endif static const value_string direction_vals[] = { { 0, "Direction: Application => Module" }, diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index b3cf2701ca..200c089c55 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -207,6 +207,7 @@ static const value_string mysql_exec_time_sign_vals[] = { {0, NULL} }; +#if 0 /* charset: pre-4.1 used the term 'charset', later changed to 'collation' */ static const value_string mysql_charset_vals[] = { {1, "big5"}, @@ -241,6 +242,7 @@ static const value_string mysql_charset_vals[] = { {29, "latin5"}, {0, NULL} }; +#endif /* collation codes may change over time, recreate with the following SQL diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index c5e549028d..fc40346b2a 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -95,6 +95,7 @@ static const value_string nmas_msgverb_enum[] = { { 0, NULL } }; +#if 0 static const value_string nmas_attribute_enum[] = { { 1, "User Name" }, { 2, "Tree Name" }, @@ -102,6 +103,7 @@ static const value_string nmas_attribute_enum[] = { { 11, "Login Sequence" }, { 0, NULL } }; +#endif static const value_string nmas_lsmverb_enum[] = { { 1, "Put Login Configuration" }, diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 5dc5a877f0..0c580b61a8 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -527,10 +527,12 @@ static const value_string qualified_name_enum[] = { { 0, NULL } }; +#if 0 static const value_string qualified_name_enum2[] = { { 0x00000000, "NDS" }, { 0, NULL } }; +#endif static const value_string spx_ndps_program_vals[] = { { 0x00060976, "Print Program" }, @@ -913,6 +915,7 @@ static const value_string ndps_filter_enum[] = { }; +#if 0 static const value_string ndps_filter_item_enum[] = { { 0x00000000, "Equality" }, { 0x00000001, "Substrings" }, @@ -932,6 +935,7 @@ static const value_string ndps_match_criteria_enum[] = { { 0x00000003, "Approximate" }, { 0, NULL } }; +#endif static const value_string ndps_operator_enum[] = { { 0x00000000, "Attributes" }, diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c index e3ac88fd63..8054b320ad 100644 --- a/epan/dissectors/packet-negoex.c +++ b/epan/dissectors/packet-negoex.c @@ -101,6 +101,7 @@ static const value_string checksum_schemes[] = { {0, NULL} }; +#if 0 static const value_string alert_types[] = { {1, "ALERT_TYPE_PULSE"}, {0, NULL} @@ -110,6 +111,7 @@ static const value_string alert_reasons[] = { {1, "ALERT_VERIFY_NO_KEY"}, {0, NULL} }; +#endif static void dissect_negoex_alert_message(tvbuff_t *tvb, diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 292b53c3ae..a11f788c1b 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -10097,11 +10097,13 @@ static const value_string iomode_names[] = { { 0, NULL } }; +#if 0 static const value_string stripetype_names[] = { { 1, "STRIPE_SPARSE" }, { 2, "STRIPE_DENSE" }, { 0, NULL } }; +#endif static const value_string layouttype_names[] = { { 1, "LAYOUT4_NFSV4_1_FILES" }, diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index 2d8ef65be1..386fd2168d 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -134,6 +134,7 @@ static const value_string tab_nsip_pdu_types[] = { #define NSIP_IE_RESET_FLAG 0x0a #define NSIP_IE_IP_ADDRESS 0x0b +#if NSIP_DEBUG static const value_string tab_nsip_ieis[] = { { NSIP_IE_CAUSE, "Cause" }, { NSIP_IE_NS_VCI, "NS-VCI" }, @@ -149,6 +150,7 @@ static const value_string tab_nsip_ieis[] = { { NSIP_IE_IP_ADDRESS, "IP Address" }, { 0, NULL }, }; +#endif /* Cause values, v 5.3.0, table 10.3.2.1, p 47 */ #define NSIP_CAUSE_TRANSIT_NETWORK_FAILURE 0x00 diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index 0bb958b462..7a9e7eef08 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -928,7 +928,7 @@ dissect_openflow_error_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre case OFPET_HELLO_FAILED: /* uint8_t data[0]; contains an ASCII text string */ proto_tree_add_item(tree, hf_openflow_v4_error_data_text, tvb, offset, length - 12, ENC_NA|ENC_ASCII); - offset += length - 12; + /*offset += length - 12;*/ break; case OFPET_BAD_REQUEST: @@ -951,7 +951,7 @@ dissect_openflow_error_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre offset = dissect_openflow_header_v4(tvb, pinfo, data_tree, offset, length); proto_tree_add_item(data_tree, hf_openflow_v4_error_data_body, tvb, offset, length - 20, ENC_NA); - offset += length - 12; + /*offset += length - 12;*/ break; case OFPET_EXPERIMENTER: @@ -961,14 +961,14 @@ dissect_openflow_error_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre /* uint8_t data[0]; */ proto_tree_add_expert_format(tree, pinfo, &ei_openflow_v4_error_undecoded, tvb, offset, length - 16, "Experimenter error body."); - offset += length - 16; + /*offset += length - 16;*/ break; default: /* uint8_t data[0]; */ proto_tree_add_expert_format(tree, pinfo, &ei_openflow_v4_error_undecoded, tvb, offset, length - 12, "Unknown error body."); - offset += length - 12; + /*offset += length - 12;*/ break; } } diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 3e7c54f88d..10b7a3a875 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -248,7 +248,9 @@ static const value_string ssdo_sacmd_values[] = { #define OPENSAFETY_SSDO_SACMD_BLK 0x80 static const true_false_string opensafety_sacmd_acc = { "Write Access", "Read Access" }; +#if 0 static const true_false_string opensafety_sacmd_res = { "Reserved", "Reserved" }; +#endif static const true_false_string opensafety_sacmd_abrt = { "Abort Transfer", "Successful Transfer" }; static const true_false_string opensafety_sacmd_seg = { "Segmented Access", "Expedited Access" }; static const true_false_string opensafety_on_off = { "On", "Off" }; diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index a5d46dcb71..77093a94bf 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -152,6 +152,7 @@ static const value_string cltp_tpdu_type_abbrev_vals[] = { { 0, NULL } }; +#if 0 static const value_string class_option_vals[] = { {0, "Class 0"}, {1, "Class 1"}, @@ -160,6 +161,7 @@ static const value_string class_option_vals[] = { {4, "Class 4"}, {0, NULL} }; +#endif /* field position */ diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 583b4d9f43..bec917fc04 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -235,12 +235,14 @@ static const value_string grace_tlv_type_vals[] = { #define OPT_RI_TLV 1 #define DYN_HOSTNAME_TLV 7 +#if 0 /* The Opaque RI LSA TLV types definitions. */ static const value_string ri_tlv_type_vals[] = { {OPT_RI_TLV, "Optional Router Informational Capabilities TLV"}, {DYN_HOSTNAME_TLV, "Dynamic Hostname TLV"}, {0, NULL} }; +#endif static const value_string ls_type_vals[] = { {OSPF_LSTYPE_ROUTER, "Router-LSA" }, diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index f07e39a29d..fcf31e5205 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -149,12 +149,14 @@ static const value_string avp_code_names[] = { { 0, NULL } }; +#if 0 static const value_string avp_resultcode_names[] = { { 0, "PANA_SUCCESS" }, { 1, "PANA_AUTHENTICATION_REJECTED" }, { 2, "PANA_AUTHORIZATION_REJECTED" }, { 0, NULL } }; +#endif typedef enum { PANA_OCTET_STRING = 1, diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index b0b9751224..0aa69d8461 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -175,13 +175,16 @@ static const value_string pdu_type_vals[] = { { 0, NULL } }; +#if 0 static const value_string feedback_ack_vals[] = { { 0, "ACK" }, { 1, "NACK" }, { 2, "STATIC-NACK" }, { 0, NULL } }; +#endif +#if 0 static const value_string feedback_option_vals[] = { { 1, "CRC" }, { 2, "REJECT" }, @@ -192,6 +195,7 @@ static const value_string feedback_option_vals[] = { { 7, "Loss" }, { 0, NULL } }; +#endif static const value_string control_pdu_type_vals[] = { { 0, "PDCP Status report" }, @@ -199,17 +203,21 @@ static const value_string control_pdu_type_vals[] = { { 0, NULL } }; +#if 0 static const value_string t_vals[] = { { 0, "ID message format" }, { 1, "TS message format" }, { 0, NULL } }; +#endif +#if 0 static const value_string ip_protocol_vals[] = { { 6, "TCP" }, { 17, "UDP" }, { 0, NULL } }; +#endif static dissector_handle_t ip_handle; diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 12a2d8cf6c..dc162e389e 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -1011,6 +1011,7 @@ static const value_string rsl_ra_if_data_rte_vals[] = { { 0, NULL } }; +#if 0 static const value_string rsl_data_rte_vals[] = { { 0x38, "32 kbit/s" }, { 0x22, "39 kbit/s" }, @@ -1023,6 +1024,7 @@ static const value_string rsl_data_rte_vals[] = { { 0x15, "1 200/75 bit/s (1 200 network-to-MS, 75 MS-to-network)" }, { 0, NULL } }; +#endif static int dissect_rsl_ie_ch_mode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean is_mandatory) diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 9f434f0bc2..6ac46c9559 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -6244,6 +6244,7 @@ static const value_string rsvp_3gpp_obj_pf_treatment_vals[] = { { 0, NULL} }; +#if 0 static const value_string rsvp_3gpp_qos_result_vals[] = { { 0, "Successful"}, { 1, "UE Initiated QoS is not authorized"}, @@ -6251,6 +6252,7 @@ static const value_string rsvp_3gpp_qos_result_vals[] = { { 3, "Requested FlowProfileIDs failed mapping"}, { 0, NULL} }; +#endif static const value_string rsvp_3gpp_obj_traffic_class_vals[] = { { 0, "Unknown"}, diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 5d72c09cd6..d524611896 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -4670,7 +4670,7 @@ proto_register_rtcp(void) "rtcp.xr.idms.spst", FT_UINT8, BASE_DEC, - NULL, + VALS(rtcp_xr_idms_spst), 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index dadd9cc7c6..2d0baa6b15 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -405,6 +405,7 @@ static const value_string submessage_id_valsv2[] = { }; +#if 0 static const value_string typecode_kind_vals[] = { { RTI_CDR_TK_NULL, "(unknown)" }, { RTI_CDR_TK_SHORT, "short" }, @@ -430,6 +431,7 @@ static const value_string typecode_kind_vals[] = { { RTI_CDR_TK_WSTRING, "wstring" }, { 0, NULL } }; +#endif static const value_string parameter_id_vals[] = { { PID_PAD, "PID_PAD" }, diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 3cb97d91e8..e1a1ee9ca0 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -184,10 +184,12 @@ static const true_false_string fua_nv_tfs = { "Read from volatile cache is NOT permitted", "Read from volatile or non-volatile cache permitted" }; +#if 0 static const true_false_string pmi_tfs = { "PMI is SET", "Pmi is CLEAR" }; +#endif static void dissect_sbc_formatunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 57cc47edd2..ef9b491d1e 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2074,10 +2074,12 @@ static const true_false_string reladr_tfs = { "Relative addressing mode is NOT supported", }; +#if 0 static const true_false_string sync_tfs = { "Synchronous data transfer is SUPPORTED", "Synchronous data transfer is NOT supported", }; +#endif static const true_false_string linked_tfs = { "Linked Commands are SUPPORTED", diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 873ab0a241..ce18419043 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -697,11 +697,13 @@ static const value_string selfm_fastser_func_code_vals[] = { { 0, NULL } }; +#if 0 static const value_string selfm_fastser_seq_vals[] = { { FAST_SER_SEQ_FIN, "FIN" }, { FAST_SER_SEQ_FIR, "FIR" }, { 0, NULL } }; +#endif static const value_string selfm_fastser_tagtype_vals[] = { { FAST_SER_TAGTYPE_CHAR8, "1 x 8-bit character per item" }, diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 53709ad185..c2783e5707 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -154,6 +154,7 @@ static const value_string siii_mdt_version_initprocvers_text[]= {0, NULL} }; +#if 0 static const value_string siii_svch_data_proccmd_proccmdexec_text[]= { {0, "Interrupt procedure command execution"}, @@ -174,6 +175,7 @@ static const value_string siii_svch_data_mdt_at_text[]= {1, "MDT-telegram"}, {0, NULL} }; +#endif #define IDN(SI, SE, type, paramset, datablock) ((SI<<24)|(SE<<16)|(type<<15)|(paramset<<12)|(datablock)) @@ -647,6 +649,7 @@ static const value_string siii_mst_phase_text[]= {0, NULL} }; +#if 0 static const value_string siii_mst_teltype_text[]= { {0x00, "CP0"}, @@ -661,6 +664,7 @@ static const value_string siii_mst_teltype_text[]= {0x84, "CP4 (Phase Change)"}, {0, NULL} }; +#endif static const value_string siii_mst_channel_text[]= { diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 69f33e87f5..62834a813a 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -536,6 +536,7 @@ static const value_string psig_parametertypenames[] = { { 0, NULL } }; +#if 0 /* Simulcrypt PSIG protocol error values */ static const value_string psig_error_values[] = { { 0x0000, "DVB Reserved" }, @@ -567,6 +568,7 @@ static const value_string psig_error_values[] = { { 0, NULL } }; +#endif /* The following hf_* variables are used to hold the Wireshark IDs of * our header fields; they are filled out when we call diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 41a63e8555..98953d9a04 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -12860,6 +12860,7 @@ dissect_qspi_unix_unlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* SMB_FIND_FILE_UNIX_INFO2 */ +#if 0 static const true_false_string tfs_i2f_secure_delete = { "File should be erased such that the data is not recoverable", "File need not be erased such that the data is not recoverable" @@ -12892,6 +12893,8 @@ static const true_false_string tfs_i2f_hidden = { "User interface programs may ignore this file", "User interface programs should not ignore this file based solely on this flag" }; +#endif + static int dissect_unix_info2_file_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset, int hf) { diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index f0322e59cf..50c8c021f8 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -189,6 +189,7 @@ enum { VD_AGENT_CAP_GUEST_LINEEND_CRLF = (1 << 9), }; +#if 0 static const value_string vd_agent_cap_vs[] = { { VD_AGENT_CAP_MOUSE_STATE, "VD_AGENT_CAP_MOUSE_STATE" }, { VD_AGENT_CAP_MONITORS_CONFIG, "VD_AGENT_CAP_MONITORS_CONFIG" }, @@ -202,16 +203,18 @@ static const value_string vd_agent_cap_vs[] = { { VD_AGENT_CAP_GUEST_LINEEND_CRLF, "VD_AGENT_CAP_GUEST_LINEEND_CRLF" }, { 0, NULL } }; - +#endif enum { VD_AGENT_CONFIG_MONITORS_FLAG_USE_POS = (1 << 0) }; +#if 0 static const value_string vd_agent_monitors_config_flag_vs[] = { { VD_AGENT_CONFIG_MONITORS_FLAG_USE_POS, "VD_AGENT_CONFIG_MONITORS_FLAG_USE_POS"}, { 0, NULL } }; +#endif enum { VD_AGENT_SUCCESS = 1, diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index c8fefe210e..5175365df8 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1551,9 +1551,11 @@ ssl_cipher_cleanup(gcry_cipher_hd_t *cipher) *cipher = NULL; } +#if 0 /* private key abstraction layer */ static inline gint ssl_get_key_len(SSL_PRIVATE_KEY* pk) {return gcry_pk_get_nbits (pk); } +#endif gcry_err_code_t _gcry_rsa_decrypt (int algo, gcry_mpi_t *result, gcry_mpi_t *data, diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 622b65c9ed..1825e0cbee 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -288,11 +288,13 @@ static const value_string attributes_reserve_next[] = { {0x00, NULL} }; +#if 0 static const value_string attributes_properties_p[] = { {0, "All allocation"}, {1, "Preserving allocation"}, {0x00, NULL} }; +#endif static const value_string attributes_family[] = { {0x0001, "IPv4"}, diff --git a/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c index 63f769af47..d312d207a8 100644 --- a/epan/dissectors/packet-teklink.c +++ b/epan/dissectors/packet-teklink.c @@ -450,9 +450,11 @@ static const value_string teklink_proc_vals[] = { { 0, NULL } }; +#if 0 static const value_string teklink_error_vals[] = { { 0, NULL } }; +#endif static const value_string teklink_cmd_vals[] = { { 0, "TLKFreeResources" }, diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 75c5ee9cee..35f3a18250 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -968,10 +968,12 @@ static const struct true_false_string tn5250_field_wdsf_dsb_flag1_0 = { "Off: Vertical scroll bar is set to off and horizontal scroll bar is set to on." }; +#if 0 static const struct true_false_string tn5250_field_wdsf_dsb_flag1_1 = { "On: The cursor is moved to the scroll bar on a pointer device scroll bar interaction", "Off: The cursor is moved to the scroll bar on a pointer device scroll bar interaction." }; +#endif static const struct true_false_string tn5250_field_wdsf_dsb_flag1_7 = { "On: Field MDT", @@ -2117,6 +2119,7 @@ static const value_string vals_tn5250_qr_flag4[] = { }; +#if 0 /* TN5250 Header - Data Type */ #define TN5250_5250_DATA 0x00 #define TN5250_BIND_IMAGE 0x03 @@ -2138,7 +2141,7 @@ static const value_string vals_tn5250_header_data_types[] = { { TN5250_UNBIND , "UNBIND"}, { 0x00, NULL } }; - +#endif /* TN5250 Header - Record Type */ #define GDS 0x12A0 @@ -2180,6 +2183,7 @@ static const value_string vals_tn5250_header_operation_code[] = { { 0x00, NULL } }; +#if 0 /* TN5250 Header _ Response Flags - Data Type Response */ #define TN5250_POSITIVE_RESPONSE 0x00 #define TN5250_NEGATIVE_RESPONSE 0x01 @@ -2189,6 +2193,7 @@ static const value_string vals_tn5250_header_response_flags_response[] = { { TN5250_NEGATIVE_RESPONSE, "NEGATIVE-RESPONSE"}, { 0x00, NULL } }; +#endif static const value_string vals_tn5250_header_error_codes[] = { diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index ad5d6a15b4..8a32565dd4 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -2621,12 +2621,14 @@ static const value_string str_download_req_force_mode[] = { {0x01, "Force Software Lock"}, {0, NULL} }; +#if 0 static const value_string str_download_req_item_id[] = { {0x00, "Patches File"}, {0x01, "Application Binary"}, {0x02, "Datas Binary"}, {0, NULL} }; +#endif static const value_string str_download_req_mode_selection_country[] = { {0x00, "No Check"}, {0x01, "For All Countries Except Chinese"}, @@ -2872,6 +2874,7 @@ static const value_string str_cs_ip_device_routing_vta_type[] = { {0, NULL} }; +#if 0 static const value_string str_cs_ip_device_routing_08_compressor[] = { {0x00, "G.711 A-law"}, {0x01, "G.711 mu-law"}, @@ -2880,6 +2883,7 @@ static const value_string str_cs_ip_device_routing_08_compressor[] = { {0x11, "G.729A 8 kbps"}, {0, NULL} }; +#endif static const val64_string str_cs_ip_device_routing_0F_compressor[] = { {0x00, "G.711 A-law"}, diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 9ad19b6b27..bd57a79011 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -47,6 +47,7 @@ static dissector_handle_t sysex_handle; #define AUDIO_SUBCLASS_AUDIOSTREAMING 0x02 #define AUDIO_SUBCLASS_MIDISTREAMING 0x03 +#if 0 static const value_string usb_audio_subclass_vals[] = { {AUDIO_SUBCLASS_UNDEFINED, "SUBCLASS_UNDEFINED"}, {AUDIO_SUBCLASS_AUDIOCONTROL, "AUDIOCONSTROL"}, @@ -54,6 +55,7 @@ static const value_string usb_audio_subclass_vals[] = { {AUDIO_SUBCLASS_MIDISTREAMING, "MIDISTREAMING"}, {0, NULL} }; +#endif static const value_string code_index_vals[] = { { 0x0, "Miscellaneous (Reserved)" }, diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 4fb33f8b55..e21e81cba4 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -59,6 +59,7 @@ static const value_string cmd_vs[] = { { 0, NULL } }; +#if 0 static const value_string account_type_vs[] = { { 0, "Player" }, { 1, "Moderator" }, @@ -66,6 +67,7 @@ static const value_string account_type_vs[] = { { 3, "Administrator" }, { 0, NULL } }; +#endif static const value_string realm_status_vs[] = { { 0, "Online" }, diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index e31418a458..a31874b1a0 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -259,6 +259,7 @@ static const value_string zbee_apf_type_names[] = { { 0, NULL } }; +#if 0 static const value_string zbee_apf_kvp_command_names[] = { { ZBEE_APP_KVP_SET, "Set" }, { ZBEE_APP_KVP_EVENT, "Event" }, @@ -270,7 +271,9 @@ static const value_string zbee_apf_kvp_command_names[] = { { ZBEE_APP_KVP_EVENT_RESP, "Event Response" }, { 0, NULL } }; +#endif +#if 0 static const value_string zbee_apf_kvp_type_names[] = { { ZBEE_APP_KVP_NO_DATA, "No Data" }, { ZBEE_APP_KVP_UINT8, "8-bit Unsigned Integer" }, @@ -284,6 +287,7 @@ static const value_string zbee_apf_kvp_type_names[] = { { ZBEE_APP_KVP_OCT_STRING, "Octet String" }, { 0, NULL } }; +#endif /* ZigBee Application Profile ID Names */ const range_string zbee_aps_apid_names[] = { diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 32d30a6f53..e304830d54 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -1790,11 +1790,13 @@ static const value_string zbee_zcl_pwr_prof_state_names[] = { { 0, NULL } }; +#if 0 /* Options Names */ static const value_string zbee_zcl_options_types[] = { { ZBEE_ZCL_OPT_PWRPROF_STIME_PRESENT, "PowerProfileStartTime Field Present" }, { 0, NULL } }; +#endif /*************************/ /* Function Bodies */ |