diff options
author | Sebastien Tandel <sebastien@tandel.be> | 2007-04-14 14:01:53 +0000 |
---|---|---|
committer | Sebastien Tandel <sebastien@tandel.be> | 2007-04-14 14:01:53 +0000 |
commit | 68ad2f4b9b0826e9e2ed1c7daf38b28d3d46794d (patch) | |
tree | c6394f4ef1a2f9a7495f7822b3cdb7ea92f06f04 /epan | |
parent | c3530274e004fe0403971fdc4c3a8d5bab89f4be (diff) |
fix MacOSX gcc-3.3 warnings about unused tfs/value_string variables
most have been tagged unused (few have been deleted if dissector has not been
modified since a long time)
move packet-ssl-utils.c to DISSECTOR_SRC
svn path=/trunk/; revision=21431
Diffstat (limited to 'epan')
31 files changed, 61 insertions, 179 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 74ca349f49..6a4ca17837 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -661,7 +661,6 @@ CLEAN_DISSECTOR_SRC = \ packet-srvloc.c \ packet-sscop.c \ packet-ssh.c \ - packet-ssl-utils.c \ packet-ssl.c \ packet-stat-notify.c \ packet-stat.c \ @@ -748,6 +747,7 @@ DISSECTOR_SRC = \ packet-sccp.c \ packet-scsi-osd.c \ packet-sctp.c \ + packet-ssl-utils.c \ packet-user_encap.c # corresponding headers diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c index 26cd3b2cf3..0ba0d97a67 100644 --- a/epan/dissectors/packet-aim-chat.c +++ b/epan/dissectors/packet-aim-chat.c @@ -55,7 +55,7 @@ #define AIM_CHAT_TLV_CONTAINS_USER_CLASS 0x066 #define AIM_CHAT_TLV_CONTAINS_USER_ARRAY 0x067 -static const aim_tlv chat_tlvs[] = { +static const aim_tlv chat_tlvs[] _U_ = { { AIM_CHAT_TLV_BROWSABLE_TREE, "Browsable tree", dissect_aim_tlv_value_bytes }, { AIM_CHAT_TLV_CLASS_EXCLUSIVE, "Exclusively for class", dissect_aim_tlv_value_userclass }, { AIM_CHAT_TLV_MAX_CONCURRENT_ROOMS, "Max. number of concurrent rooms", dissect_aim_tlv_value_uint8 }, diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 04b71f1763..d38fdb8969 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -93,7 +93,7 @@ static const aim_tlv rendezvous_tlvs[] = { #define MINITYPING_TEXT_TYPED_SIGN 0x0001 #define MINITYPING_BEGUN_SIGN 0x0002 -static const value_string minityping_type[] = { +static const value_string minityping_type[] _U_ = { {MINITYPING_FINISHED_SIGN, "Typing finished sign" }, {MINITYPING_TEXT_TYPED_SIGN, "Text typed sign" }, {MINITYPING_BEGUN_SIGN, "Typing begun sign" }, diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 68f82e603b..12f6dd812a 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -712,7 +712,6 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static const guint8 mac_broadcast[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; static const guint8 mac_allzero[6] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static void diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 52c05b90f3..cb110374df 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -1042,7 +1042,7 @@ dissect_bssap_imsi(tvbuff_t *tvb, proto_tree *tree, int offset) return offset + ie_len; } -static const value_string bssap_imsi_det_from_gprs_serv_type_values[] = { +static const value_string bssap_imsi_det_from_gprs_serv_type_values[] _U_ = { { 0x00, "Interpreted as reserved in this version of the protocol" }, { 0x01, "Network initiated IMSI detach from GPRS service" }, { 0x02, "MS initiated IMSI detach from GPRS service" }, diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index b79a525956..96c9272bdd 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -139,65 +139,6 @@ static const value_string vs_ctl_pn_cl[] = { {0, NULL} }; -static const value_string vs_ctl_rpn_b[] = { - {0, "2400"}, - {1, "4800"}, - {2, "7200"}, - {3, "9600"}, - {4, "19200"}, - {5, "38400"}, - {6, "57600"}, - {7, "115200"}, - {8, "230400"}, - {0, NULL} -}; - - -static const value_string vs_ctl_rpn_d[] = { - {0x0, "5"}, - {0x2, "6"}, - {0x1, "7"}, - {0x3, "8"}, - {0, NULL} -}; - - -static const value_string vs_ctl_rpn_s[] = { - {0, "1"}, - {1, "1.5"}, - {0, NULL} -}; - - -static const true_false_string tfs_ctl_rpn_p = { - "parity", "no parity" -}; - - -static const value_string vs_ctl_rpn_pt[] = { - {0, "odd parity"}, - {1, "even parity"}, - {2, "mark parity"}, - {3, "space parity"}, - {0, NULL} -}; - - -static const value_string vs_ctl_rls_l[] = { - /* L1 == 1, masked 0x0e */ - {0x1, "Overrun error"}, - {0x2, "Parity error"}, - {0x4, "Framing error"}, - {0, NULL} -}; - - -static const value_string vs_rfcomm_addr_d[] = { - {1, "Server Device"}, - {0, "Initiating Device"}, - {0, NULL} -}; - static const value_string vs_frame_type[] = { /* masked 0xef */ diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 534dcef533..78b7583530 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -69,16 +69,6 @@ static const value_string vs_pduid[] = { {0, NULL} }; -static const value_string vs_error_code[] = { - {0x0001, "Invalid/unsupported SDP version"}, - {0x0002, "Invalid Service Record Handle"}, - {0x0003, "Invalid request syntax"}, - {0x0004, "Invalid PDU size"}, - {0x0005, "Invalid Continuation State"}, - {0x0006, "Insufficient Resources to satisfy Request"}, - {0, NULL} -}; - static const value_string vs_general_attribute_id[] = { {0x0000, "ServiceRecordHandle"}, {0x0001, "ServiceClassIDList"}, @@ -99,33 +89,6 @@ static const value_string vs_general_attribute_id[] = { {0, NULL} }; - -static const value_string vs_protocols[] = { - {0x0001, "SDP"}, - {0x0002, "UDP"}, - {0x0003, "RFCOMM"}, - {0x0004, "TCP"}, - {0x0005, "TCS-BIN"}, - {0x0006, "TCS-AT"}, - {0x0008, "OBEX"}, - {0x0009, "IP"}, - {0x000A, "FTP"}, - {0x000C, "HTTP"}, - {0x000E, "WSP"}, - {0x000F, "BNEP"}, - {0x0010, "UPNP"}, - {0x0011, "HIDP"}, - {0x0012, "HardcopyControlChannel"}, - {0x0014, "HardcopyDataChannel"}, - {0x0016, "HardcopyNotification"}, - {0x0017, "AVCTP"}, - {0x0019, "AVDTP"}, - {0x001B, "CMPT"}, - {0x001D, "UDI_C-Plane"}, - {0x0100, "L2CAP"}, - {0, NULL} -}; - static const value_string vs_service_classes[] = { {0x0001, "SDP"}, diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index e37f87ee00..8f2d313c95 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -217,17 +217,6 @@ static const value_string nsp_msg_type_vals[] = { { 0, NULL } }; -static const value_string rt_iinfo_flags[] = { - {0x01, "Level 2 router"}, - {0x02, "Level 1 router"}, - {0x04, "Verification required"}, - {0x08, "Rejected"}, - {0x10, "Verification failed"}, - {0x20, "Does not accept multicast"}, - {0x40, "Blocking requested"}, - {0x0, NULL} -}; - static const value_string rt_tiinfo_vals[] = { {0x01, "Level 2 router"}, {0x02, "Level 1 router"}, diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 9bc350de13..913bac6e60 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -564,7 +564,7 @@ static const value_string dnp3_ctl_func_sec_vals[] = { { 0, NULL } }; -static const value_string dnp3_ctl_flags_pri_vals[] = { +static const value_string dnp3_ctl_flags_pri_vals[] _U_ = { { DNP3_CTL_DIR, "DIR" }, { DNP3_CTL_PRM, "PRM" }, { DNP3_CTL_FCB, "FCB" }, @@ -572,7 +572,7 @@ static const value_string dnp3_ctl_flags_pri_vals[] = { { 0, NULL } }; -static const value_string dnp3_ctl_flags_sec_vals[] = { +static const value_string dnp3_ctl_flags_sec_vals[] _U_ = { { DNP3_CTL_DIR, "DIR" }, { DNP3_CTL_PRM, "PRM" }, { DNP3_CTL_RES, "RES" }, @@ -580,13 +580,13 @@ static const value_string dnp3_ctl_flags_sec_vals[] = { { 0, NULL } }; -static const value_string dnp3_tr_flags_vals[] = { +static const value_string dnp3_tr_flags_vals[] _U_ = { { DNP3_TR_FIN, "FIN" }, { DNP3_TR_FIR, "FIR" }, { 0, NULL } }; -static const value_string dnp3_al_flags_vals[] = { +static const value_string dnp3_al_flags_vals[] _U_ = { { DNP3_AL_FIR, "FIR" }, { DNP3_AL_FIN, "FIN" }, { DNP3_AL_CON, "CON" }, @@ -625,7 +625,7 @@ static const value_string dnp3_al_func_vals[] = { }; /* Application Layer Internal Indication (IIN) bit Values */ -static const value_string dnp3_al_iin_vals[] = { +static const value_string dnp3_al_iin_vals[] _U_ = { { AL_IIN_BMSG, "Broadcast message Rx'd" }, { AL_IIN_CLS1D, "Class 1 Data Available" }, { AL_IIN_CLS2D, "Class 2 Data Available" }, @@ -781,7 +781,7 @@ static const value_string dnp3_al_ctl_status_vals[] = { }; /* Application Layer Binary Input Quality Flag Values */ -static const value_string dnp3_al_biflag_vals[] = { +static const value_string dnp3_al_biflag_vals[] _U_ = { { AL_OBJ_BI_FLAG0, "Online" }, { AL_OBJ_BI_FLAG1, "Restart" }, { AL_OBJ_BI_FLAG2, "Comm Fail" }, @@ -792,7 +792,7 @@ static const value_string dnp3_al_biflag_vals[] = { }; /* Application Layer Counter Quality Flag Values */ -static const value_string dnp3_al_ctrflag_vals[] = { +static const value_string dnp3_al_ctrflag_vals[] _U_ = { { AL_OBJ_CTR_FLAG0, "Online" }, { AL_OBJ_CTR_FLAG1, "Restart" }, { AL_OBJ_CTR_FLAG2, "Comm Fail" }, @@ -804,7 +804,7 @@ static const value_string dnp3_al_ctrflag_vals[] = { }; /* Application Layer Analog Input Quality Flag Values */ -static const value_string dnp3_al_aiflag_vals[] = { +static const value_string dnp3_al_aiflag_vals[] _U_ = { { AL_OBJ_AI_FLAG0, "Online" }, { AL_OBJ_AI_FLAG1, "Restart" }, { AL_OBJ_AI_FLAG2, "Comm Fail" }, diff --git a/epan/dissectors/packet-epl.h b/epan/dissectors/packet-epl.h index 590b756b34..dd48ce2fb9 100644 --- a/epan/dissectors/packet-epl.h +++ b/epan/dissectors/packet-epl.h @@ -87,7 +87,7 @@ static const value_string addr_str_vals[] = { static const gchar* addr_str_cn = " (Controlled Node)"; static const gchar* addr_str_res = " (reserved)"; -static const value_string addr_str_abbr_vals[] = { +static const value_string addr_str_abbr_vals[] _U_ = { {EPL_INVALID_NODEID, " (inv.)" }, {EPL_MN_NODEID, " (MN)" }, {EPL_DIAGNOSTIC_DEVICE_NODEID, " (diag.)" }, diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 66a85bdff1..3abd6937a0 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -221,7 +221,7 @@ static const value_string fc_ftype_vals [] = { {0, NULL}, }; -static const value_string fc_wka_vals[] = { +static const value_string fc_wka_vals[] _U_ = { {FC_WKA_MULTICAST, "Multicast Server"}, {FC_WKA_CLKSYNC, "Clock Sync Server"}, {FC_WKA_KEYDIST, "Key Distribution Server"}, diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index d87acce6c7..d52490a4a0 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -33,7 +33,7 @@ #include <glib.h> #include <epan/packet.h> -static const value_string message_types[] = { +static const value_string message_types[] _U_ = { { 0x30, "Heartbeat" }, { 0x31, "Test Request" }, { 0x32, "Resend Request" }, diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 1968b261bf..79d8b0b7e1 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -595,12 +595,6 @@ static const guint GIOP_MAJOR = 1; static const guint GIOP_MINOR = 2; -static const int KeyAddr = 0; -static const int ProfileAddr = 1; -static const int ReferenceAddr = 2; - - - static const value_string reply_status_types[] = { { NO_EXCEPTION, "No Exception" } , { USER_EXCEPTION, "User Exception" } , @@ -716,8 +710,8 @@ static GSList *giop_sub_list = NULL; */ static const char giop_op_resolve[] = "resolve"; -static const char giop_op_bind_new_context[] = "bind_new_context"; -static const char giop_op_bind[] = "bind"; +static const char giop_op_bind_new_context[] _U_ = "bind_new_context"; +static const char giop_op_bind[] _U_ = "bind"; static const char giop_op_is_a[] = "_is_a"; /* diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c index 89900e763e..b1e4bcb299 100644 --- a/epan/dissectors/packet-gsm_a.c +++ b/epan/dissectors/packet-gsm_a.c @@ -5221,7 +5221,7 @@ Bit 8 7 0 1 group transmit mode Other values are reserved for future use. */ -static const value_string gsm_a_rr_target_mode_vals[] = { +static const value_string gsm_a_rr_target_mode_vals[] _U_ = { { 0, "Dedicated mode"}, { 1, "Group transmit mode"}, { 0, NULL } @@ -7990,6 +7990,7 @@ dissect_ROS_Component(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack } +#if 0 static const value_string ROS_ERROR_vals[] = { { 0, "localValue" }, { 1, "globalValue" }, @@ -8002,7 +8003,6 @@ static const ber_choice_t ERROR_choice[] = { { 0, 0, 0, 0, NULL } }; -#if 0 static int dissect_ROS_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_choice(pinfo, tree, tvb, offset, diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c index 2044b86fca..48eb19dfa1 100644 --- a/epan/dissectors/packet-h248_3gpp.c +++ b/epan/dissectors/packet-h248_3gpp.c @@ -102,7 +102,7 @@ static const value_string h248_3GUP_initdir_vals[] = { {0, NULL} }; -static const value_string h248_3GUP_parameters[] = { +static const value_string h248_3GUP_parameters[] _U_ = { { 0x0001, "Mode" }, { 0x0002, "UPversions" }, { 0x0003, "Delivery of erroneous SDUs" }, @@ -163,7 +163,7 @@ static const value_string h248_3GCSD_properties_vals[] = { {0, NULL} }; -static const value_string h248_3GCSD_signals_vals[] = { +static const value_string h248_3GCSD_signals_vals[] _U_ = { { 0x0001, "actprot" }, {0, NULL} }; @@ -173,7 +173,7 @@ static const value_string h248_3GCSD_signal_actprot_vals[] = { {0, NULL} }; -static const value_string h248_3GCSD_events_vals[] = { +static const value_string h248_3GCSD_events_vals[] _U_ = { { 0x0001, "protres"}, { 0x0002, "ratechg"}, {0, NULL} diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index c9677f4d6b..6591d7b3e0 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -338,7 +338,7 @@ static const value_string h248_annexc_transmission_mode[] = { {0,NULL} }; -static const value_string h248_pkg_annexc_sc[] = { +static const value_string h248_pkg_annexc_sc[] _U_ = { {0,"CBR"}, {1,"nrt-VBR1"}, {2,"nrt-VBR2"}, @@ -445,7 +445,7 @@ static const value_string h248_pkg_annexc_nicrx_values[] = { }; -static const value_string h248_pkg_annexc_flowconttx_values[] = { +static const value_string h248_pkg_annexc_flowconttx_values[] _U_ = { {0,"Not Required"}, {1,"Required"}, {0,NULL} @@ -608,7 +608,7 @@ static const value_string h248_pkg_annexc_addlayer3prot_values[] = { {0,NULL} }; -static const value_string h248_pkg_annexc_nci_satelite_values[] = { +static const value_string h248_pkg_annexc_nci_satelite_values[] _U_ = { {0x0,"no satelite circuit"}, {0x1,"one satellite circuit"}, {0x2,"two satelite circiuts"}, @@ -616,7 +616,7 @@ static const value_string h248_pkg_annexc_nci_satelite_values[] = { {0,NULL} }; -static const value_string h248_pkg_annexc_nci_continuity_values[] = { +static const value_string h248_pkg_annexc_nci_continuity_values[] _U_ = { {0x0,"continuity check not required"}, {0x1,"continuity check required on this circuit"}, {0x2,"continuity check performed on a previous circuit"}, @@ -624,7 +624,7 @@ static const value_string h248_pkg_annexc_nci_continuity_values[] = { {0,NULL} }; -static const value_string h248_pkg_annexc_nci_echoctl_values[] = { +static const value_string h248_pkg_annexc_nci_echoctl_values[] _U_ = { {0x0,"outgoing echo control device not included"}, {0x1,"outgoing echo control device included"}, {0,NULL} diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index eff014c7b9..f6d5a45494 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.c @@ -51,7 +51,7 @@ static gint ett_h248_pkg_generic_cause_evt = -1; static gint ett_h248_pkg_generic = -1; static int ett_h248_pkg_generic_sc_evt = -1; -static const value_string h248_pkg_generic_cause_vals[] = { +static const value_string h248_pkg_generic_cause_vals[] _U_ = { {1, "gencause"}, {2, "failurecause"}, { 0, NULL } @@ -79,7 +79,7 @@ static h248_pkg_param_t h248_pkg_generic_cause_evt_params[] = { { 0, NULL, NULL, NULL} }; -static const value_string h248_pkg_generic_sc_meth_vals[] = { +static const value_string h248_pkg_generic_sc_meth_vals[] _U_ = { {0x0001,"SigID"}, {0x0002,"Meth"}, {0x0003,"SLID"}, @@ -326,7 +326,7 @@ static h248_pkg_evt_t h248_pkg_al_evts[] = { }; /* Packet defenitions */ -static const value_string h248_pkg_al_parameters[] = { +static const value_string h248_pkg_al_parameters[] _U_ = { /* Signals */ { 0x0002, "ri (Ring)" }, /* Events */ @@ -357,7 +357,7 @@ static int hf_h248_pkg_rtp_stat_ps = -1; static int ett_h248_pkg_rtp = -1; -static const value_string h248_pkg_rtp_stat_vals[] = { +static const value_string h248_pkg_rtp_stat_vals[] _U_ = { { 0x0004, "ps"}, { 0, NULL} }; diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c index b6f7a75fcc..2c1e6bdc2d 100644 --- a/epan/dissectors/packet-h248_q1950.c +++ b/epan/dissectors/packet-h248_q1950.c @@ -43,7 +43,7 @@ static int hf_h248_pkg_BCP_BNCChar = -1; static int ett_h248_pkg_BCP = -1; -static const value_string h248_pkg_BCP_parameters[] = { +static const value_string h248_pkg_BCP_parameters[] _U_ = { { 0x0001, "BNCChar (BNC Characteristics)" }, {0, NULL} }; @@ -81,7 +81,7 @@ static int hf_h248_pkg_BNCCT_prop = -1; static int ett_h248_pkg_BNCCT = -1; -static const value_string h248_pkg_BNCCT_parameters[] = { +static const value_string h248_pkg_BNCCT_parameters[] _U_ = { { 0x0001, "BNC Cut Through Capability" }, { 0, NULL } }; @@ -303,14 +303,14 @@ static const value_string h248_pkg_bt_props_vals[] = { {0,NULL} }; -static const value_string h248_pkg_bt_tunopt_vals[] = { +static const value_string h248_pkg_bt_tunopt_vals[] _U_ = { {1,"1 (In the same message as the command response to the command which generated the bearer control tunnel)"}, {2,"2 (Tunnel message at any time)"}, {3,"NO"}, {0,NULL} }; -static const h248_pkg_param_t h248_pkg_bt_props[] = { +static const h248_pkg_param_t h248_pkg_bt_props[] _U_ = { { 0x0001, &hf_h248_pkg_bt_tunopt, h248_param_ber_integer, &implicit }, { 0, NULL, NULL, NULL} }; diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 1b1b8fc98f..674cce7ab9 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1915,7 +1915,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (esp_crypt_key_len != gcry_cipher_get_algo_keylen (crypt_algo_libgcrypt)) { - fprintf (stderr,"<ESP Preferences> Error in Encryption Algorithm 3DES-CBC : Bad Keylen (got %i Bits, need %i)\n", + fprintf (stderr,"<ESP Preferences> Error in Encryption Algorithm 3DES-CBC : Bad Keylen (got %i Bits, need %u)\n", esp_crypt_key_len * 8, gcry_cipher_get_algo_keylen (crypt_algo_libgcrypt) * 8); decrypt_ok = FALSE; } @@ -2008,7 +2008,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (esp_crypt_key_len != gcry_cipher_get_algo_keylen (crypt_algo_libgcrypt)) { - fprintf (stderr,"<ESP Preferences> Error in Encryption Algorithm DES-CBC : Bad Keylen (%i Bits, need %i)\n", + fprintf (stderr,"<ESP Preferences> Error in Encryption Algorithm DES-CBC : Bad Keylen (%i Bits, need %u)\n", esp_crypt_key_len * 8, gcry_cipher_get_algo_keylen (crypt_algo_libgcrypt) * 8); decrypt_ok = FALSE; } @@ -2153,7 +2153,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (esp_crypt_key_len != gcry_cipher_get_algo_keylen (crypt_algo_libgcrypt)) { - fprintf (stderr,"<ESP Preferences> Error in Encryption Algorithm BLOWFISH-CBC : Bad Keylen (%i Bits, need %i)\n", + fprintf (stderr,"<ESP Preferences> Error in Encryption Algorithm BLOWFISH-CBC : Bad Keylen (%i Bits, need %u)\n", esp_crypt_key_len * 8, gcry_cipher_get_algo_keylen (crypt_algo_libgcrypt) * 8); decrypt_ok = FALSE; } diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index a7afd4b9db..1d274ae8a3 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -705,7 +705,7 @@ static const value_string shimverifmethods[] = { { 0, NULL }, }; -static const value_string shimflags[] = { +static const value_string shimflags[] _U_ = { { SHIM6_FLAG_BROKEN, "BROKEN" }, { SHIM6_FLAG_TEMPORARY, "TEMPORARY" }, { 0, NULL }, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index ecf3315387..8245dc1ec6 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -701,7 +701,7 @@ static const guint8 VID_draft_ietf_ipsec_heartbeats_00[VID_LEN_8]= {0x8D, 0xB7, * 8k10, which means every 8K (?), and version 1.0 of the protocol (?). I won't add it to the code, until I know what it really * means. ykaul-at-bezeqint.net */ -static const guint8 VID_HeartBeat_Notify[VID_LEN] = {0x48, 0x65, 0x61, 0x72, 0x74, 0x42, 0x65, 0x61, 0x74, 0x5f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79}; +static const guint8 VID_HeartBeat_Notify[VID_LEN] _U_ = {0x48, 0x65, 0x61, 0x72, 0x74, 0x42, 0x65, 0x61, 0x74, 0x5f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79}; void isakmp_dissect_payloads(tvbuff_t *tvb, proto_tree *tree, int isakmp_version, diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 6bb6a5ef56..e8d82bb42c 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -66,15 +66,11 @@ static const int JXTAMSG1_ELMFLAG_TYPE = 1 << 0; static const int JXTAMSG1_ELMFLAG_ENCODING = 1 << 1; static const int JXTAMSG1_ELMFLAG_SIGNATURE = 1 << 2; -static const int JXTAMSG2_MSGFLAG_UTF16BE_STRINGS = 1 << 0; -static const int JXTAMSG2_MSGFLAG_UTF32BE_STRINGS = 1 << 1; - static const int JXTAMSG2_ELMFLAG_UINT64_LENS = 1 << 0; static const int JXTAMSG2_ELMFLAG_NAME_LITERAL = 1 << 1; static const int JXTAMSG2_ELMFLAG_TYPE = 1 << 2; static const int JXTAMSG2_ELMFLAG_SIGNATURE = 1 << 3; static const int JXTAMSG2_ELMFLAG_ENCODINGS = 1 << 4; -static const int JXTAMSG2_ELMFLAG_ENCODED_SIGNED = 1 << 5; static int proto_jxta = -1; static int proto_message_jxta = -1; diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 67bd15c6d7..12ad99eb88 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -295,7 +295,7 @@ enum srtp_policy_type_t { #define SP_TEXT_AUTH_TAG_LEN "Authentication tag length" #define SP_TEXT_SRTP_PREFIX "SRTP prefix length" -static const value_string srtp_policy_type_vals[] = { +static const value_string srtp_policy_type_vals[] _U_ = { { SP_ENCR_ALG, SP_TEXT_ENCR_ALG }, { SP_ENCR_LEN, SP_TEXT_ENCR_LEN }, { SP_AUTH_ALG, SP_TEXT_AUTH_ALG }, diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index b504667192..9583c43c52 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -119,7 +119,7 @@ static const value_string sss_verb_enum[] = { { 0, NULL } }; -static const value_string sss_subverb_enum[] = { +static const value_string sss_subverb_enum[] _U_ = { { 0, "Fragmented Ping" }, { 2, "Client Put Data" }, { 4, "Client Get Data" }, @@ -130,7 +130,7 @@ static const value_string sss_subverb_enum[] = { { 0, NULL } }; -static const value_string sss_msgverb_enum[] = { +static const value_string sss_msgverb_enum[] _U_ = { { 1, "Echo Data" }, { 3, "Start Session" }, { 5, "Client Write Data" }, @@ -139,7 +139,7 @@ static const value_string sss_msgverb_enum[] = { { 0, NULL } }; -static const value_string sss_attribute_enum[] = { +static const value_string sss_attribute_enum[] _U_ = { { 1, "User Name" }, { 2, "Tree Name" }, { 4, "Clearence" }, @@ -147,7 +147,7 @@ static const value_string sss_attribute_enum[] = { { 0, NULL } }; -static const value_string sss_lsmverb_enum[] = { +static const value_string sss_lsmverb_enum[] _U_ = { { 1, "Put Login Configuration" }, { 2, "Get Login Configuration" }, { 4, "Delete Login Configuration" }, diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 0baf565755..e1af68b21f 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -166,7 +166,7 @@ static const value_string avp_code_names[] = { { 0, NULL } }; -static const value_string avp_resultcode_names[] = { +static const value_string avp_resultcode_names[] _U_ = { { 2001, "PANA_SUCCESS" }, { 3001, "PANA_MESSAGE_UNSUPPORTED" }, { 3002, "PANA_UNABLE_TO_DELIVER" }, diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index f1be28b56f..64f160740a 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -505,7 +505,7 @@ static const value_string keySetNames[] = { }; /* Define soft key labels for the Telecaster station */ -static const value_string softKeyLabel[] = { +static const value_string softKeyLabel[] _U_ = { {0 , "undefined"}, {1 , "Redial"}, {2 , "NewCall"}, diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 4a54617cf5..4aff3a1098 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -604,7 +604,7 @@ static const true_false_string falsetrue = { "False" }; -static const value_string status_vals[] = { +static const value_string status_vals[] _U_ = { { 0x00, "Unsatisfied, can't complete" }, { 0x01, "Discovery in process" }, { 0x02, "Satisfied, Discovery complete" }, diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 04fb3e8371..8e3ceb8348 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -163,7 +163,7 @@ static const value_string ssh1_msg_vals[] = { }; -static const value_string ssh_opcode_vals[] = { +static const value_string ssh_opcode_vals[] _U_ = { { 0, NULL } }; diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 48137c06ff..e17e03fa7f 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -151,7 +151,7 @@ * Lookup tables * */ -static const value_string ssl_20_msg_types[] = { +static const value_string ssl_20_msg_types[] _U_ = { { SSL2_HND_ERROR, "Error" }, { SSL2_HND_CLIENT_HELLO, "Client Hello" }, { SSL2_HND_CLIENT_MASTER_KEY, "Client Master Key" }, @@ -164,7 +164,7 @@ static const value_string ssl_20_msg_types[] = { { 0x00, NULL }, }; -static const value_string ssl_20_cipher_suites[] = { +static const value_string ssl_20_cipher_suites[] _U_ = { { 0x010080, "SSL2_RC4_128_WITH_MD5" }, { 0x020080, "SSL2_RC4_128_EXPORT40_WITH_MD5" }, { 0x030080, "SSL2_RC2_CBC_128_CBC_WITH_MD5" }, @@ -265,7 +265,7 @@ static const value_string ssl_20_cipher_suites[] = { { 0x00, NULL } }; -static const value_string ssl_20_certificate_type[] = { +static const value_string ssl_20_certificate_type[] _U_ = { { 0x00, "N/A" }, { 0x01, "X.509 Certificate" }, { 0x00, NULL }, @@ -466,7 +466,7 @@ static const value_string ssl_31_ciphersuite[] = { { 0x00, NULL } }; -static const value_string pct_msg_types[] = { +static const value_string pct_msg_types[] _U_ = { { PCT_MSG_CLIENT_HELLO, "Client Hello" }, { PCT_MSG_SERVER_HELLO, "Server Hello" }, { PCT_MSG_CLIENT_MASTER_KEY, "Client Master Key" }, @@ -475,7 +475,7 @@ static const value_string pct_msg_types[] = { { 0x00, NULL }, }; -static const value_string pct_cipher_type[] = { +static const value_string pct_cipher_type[] _U_ = { { PCT_CIPHER_DES, "DES" }, { PCT_CIPHER_IDEA, "IDEA" }, { PCT_CIPHER_RC2, "RC2" }, @@ -485,7 +485,7 @@ static const value_string pct_cipher_type[] = { { 0x00, NULL }, }; -static const value_string pct_hash_type[] = { +static const value_string pct_hash_type[] _U_ = { { PCT_HASH_MD5, "MD5" }, { PCT_HASH_MD5_TRUNC_64, "MD5_TRUNC_64"}, { PCT_HASH_SHA, "SHA"}, @@ -494,13 +494,13 @@ static const value_string pct_hash_type[] = { { 0x00, NULL }, }; -static const value_string pct_cert_type[] = { +static const value_string pct_cert_type[] _U_ = { { PCT_CERT_NONE, "None" }, { PCT_CERT_X509, "X.509" }, { PCT_CERT_PKCS7, "PKCS #7" }, { 0x00, NULL }, }; -static const value_string pct_sig_type[] = { +static const value_string pct_sig_type[] _U_ = { { PCT_SIG_NONE, "None" }, { PCT_SIG_RSA_MD5, "MD5" }, { PCT_SIG_RSA_SHA, "RSA SHA" }, @@ -508,7 +508,7 @@ static const value_string pct_sig_type[] = { { 0x00, NULL }, }; -static const value_string pct_exch_type[] = { +static const value_string pct_exch_type[] _U_ = { { PCT_EXCH_RSA_PKCS1, "RSA PKCS#1" }, { PCT_EXCH_RSA_PKCS1_TOKEN_DES, "RSA PKCS#1 Token DES" }, { PCT_EXCH_RSA_PKCS1_TOKEN_DES3, "RSA PKCS#1 Token 3DES" }, @@ -521,7 +521,7 @@ static const value_string pct_exch_type[] = { { 0x00, NULL }, }; -static const value_string pct_error_code[] = { +static const value_string pct_error_code[] _U_ = { { PCT_ERR_BAD_CERTIFICATE, "PCT_ERR_BAD_CERTIFICATE" }, { PCT_ERR_CLIENT_AUTH_FAILED, "PCT_ERR_CLIENT_AUTH_FAILE" }, { PCT_ERR_ILLEGAL_MESSAGE, "PCT_ERR_ILLEGAL_MESSAGE" }, diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 5a8e4e1485..aacf0dff29 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -295,7 +295,7 @@ static const value_string tipcv2_data_msg_type_defines[] = { { 3, "DirectMsg"}, { 0, NULL} }; -static const value_string tipcv2_data_msg_type_values[] = { +static const value_string tipcv2_data_msg_type_values[] _U_ = { { 0, "Sent on connection (CONN_MSG)"}, { 1, "Logical multicast (MCAST_MSG)"}, { 2, "Port name destination address (NAMED_MSG)"}, diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 169cee205f..a8e674c815 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -444,7 +444,7 @@ static const value_string discovery_reject_cause_vals[] = { { 0, NULL } }; /*EC Emergency Call allowed (octet 3)*/ -static const value_string EC_vals[] = { +static const value_string EC_vals[] _U_ = { { 0, "Emergency call allowed in the cell to all MSs"}, { 1, "Emergency call not allowed in the cell except for the MSs that belong to one of the classes between 11 to 15."}, { 0, NULL } |