diff options
-rw-r--r-- | epan/dissectors/packet-armagetronad.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-aruba-adp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-diameter.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-h248_annex_c.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-iapp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-icp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ip.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-isup.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-lmp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ncp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-netflow.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-nt-sonmp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-q933.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-radius_packetcable.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rsvp.c | 36 | ||||
-rw-r--r-- | epan/dissectors/packet-trmac.c | 4 |
18 files changed, 58 insertions, 58 deletions
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index f6509c244e..1a82dc37c4 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -59,7 +59,7 @@ static gint ett_message = -1; * The numbers and names were retrieved at runtime using the * 'nDescriptor* descriptors[MAXDESCRIPTORS]' array */ -static value_string descriptors[] = { +static const value_string descriptors[] = { {1, "ack"}, {2, "req_info"}, {3, "login_deny"}, diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 840dbce27b..33662cb5ac 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -47,7 +47,7 @@ static int hf_adp_id = -1; static int hf_adp_mac = -1; static int hf_adp_switchip = -1; -static value_string adp_type_val[] = +static const value_string adp_type_val[] = { {1, "Request"}, {2, "Response"}, diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index c14f20460f..53656b48ab 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -174,7 +174,7 @@ typedef struct _proto_avp_t { static const char* simple_avp(diam_ctx_t*, diam_avp_t*, tvbuff_t*); -static value_string no_vs[] = {{0, NULL} }; +static const value_string no_vs[] = {{0, NULL} }; static GArray no_garr = { (void*)no_vs, 1 }; static diam_vnd_t unknown_vendor = { 0xffffffff, &no_garr, &no_garr }; static diam_vnd_t no_vnd = { 0, NULL, NULL }; @@ -182,7 +182,7 @@ static diam_avp_t unknown_avp = {0, &unknown_vendor, simple_avp, simple_avp, -1, static GArray* all_cmds; static diam_dictionary_t dictionary = { NULL, NULL, NULL, NULL }; static struct _build_dict build_dict; -static value_string* vnd_short_vs; +static const value_string* vnd_short_vs; static dissector_handle_t data_handle; static const true_false_string reserved_set = { diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index a871861a19..12351bc866 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -175,7 +175,7 @@ static gint ett_annexc = -1; static gint ett_vpvc = -1; static gint ett_codec = -1; -static value_string h248_annexc_package_properties_vals[] = { +static const value_string h248_annexc_package_properties_vals[] = { { 0x1001, "media" }, { 0x1002, "transmission mode" }, { 0x1003, "num_of_channels" }, diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 67dfe6e4c9..3ebc428980 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -114,14 +114,14 @@ typedef struct _e_pduhdr { guint8 pdu_len_l; } e_pduhdr; -static value_string iapp_vals[] = { +static const value_string iapp_vals[] = { {IAPP_ANNOUNCE_REQUEST, "Announce Request"}, {IAPP_ANNOUNCE_RESPONSE, "Announce Response"}, {IAPP_HANDOVER_REQUEST, "Handover Request"}, {IAPP_HANDOVER_RESPONSE, "Handover Response"}, {0, NULL}}; -static value_string iapp_pdu_type_vals[] = { +static const value_string iapp_pdu_type_vals[] = { {IAPP_PDU_SSID, "Network Name"}, {IAPP_PDU_BSSID, "BSSID"}, {IAPP_PDU_OLDBSSID, "Old BSSID"}, @@ -138,12 +138,12 @@ static value_string iapp_pdu_type_vals[] = { {IAPP_PDU_AUTHINFO, "ELSA Authentication Info"}, {0, NULL}}; -static value_string iapp_cap_vals[] = { +static const value_string iapp_cap_vals[] = { {IAPP_CAP_FORWARDING, "Forwarding"}, {IAPP_CAP_WEP, "WEP"}, {0, NULL}}; -static value_string iapp_phy_vals[] = { +static const value_string iapp_phy_vals[] = { {IAPP_PHY_PROP, "Proprietary"}, {IAPP_PHY_FHSS, "FHSS"}, {IAPP_PHY_DSSS, "DSSS"}, @@ -151,7 +151,7 @@ static value_string iapp_phy_vals[] = { {IAPP_PHY_OFDM, "OFDM"}, {0, NULL}}; -static value_string iapp_dom_vals[] = { +static const value_string iapp_dom_vals[] = { {IAPP_DOM_FCC, "FCC (USA)"}, {IAPP_DOM_IC, "IC (Canada)"}, {IAPP_DOM_ETSI, "ETSI (Europe)"}, @@ -160,7 +160,7 @@ static value_string iapp_dom_vals[] = { {IAPP_DOM_MKK, "MKK (Japan)"}, {0, NULL}}; -static value_string iapp_auth_type_vals[] = { +static const value_string iapp_auth_type_vals[] = { {IAPP_AUTH_STATUS, "Status"}, {IAPP_AUTH_USERNAME, "User Name"}, {IAPP_AUTH_PROVNAME, "Provider Name"}, diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 5dca4998b9..55395f383a 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -64,7 +64,7 @@ static gint ett_icp_payload = -1; #define CODE_ICP_OP_DENIED 22 #define CODE_ICP_OP_HIT_OBJ 23 -static value_string opcode_vals[] = { +static const value_string opcode_vals[] = { { CODE_ICP_OP_INVALID , "ICP_INVALID" }, { CODE_ICP_OP_QUERY , "ICP_QUERY" }, { CODE_ICP_OP_HIT , "ICP_HIT" }, diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index e93c8aa411..3ac36dc8c0 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1577,7 +1577,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) #define ICMP_MIP_PREFIX_LENGTHS 19 #define ICMP_MIP_CHALLENGE 24 -static value_string mip_extensions[] = { +static const value_string mip_extensions[] = { { ICMP_MIP_EXTENSION_PAD, "One byte padding extension"}, /* RFC 2002 */ { ICMP_MIP_MOB_AGENT_ADV, "Mobility Agent Advertisement Extension"}, /* RFC 2002 */ diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index dcb252ab89..0ea994616a 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -2810,7 +2810,7 @@ static const value_string Instruction_indicator_for_pass_on_not_possible_vals[] { 3, "reserved (interpreted as 00)"}, { 0, NULL}}; -static value_string bat_ase_action_indicator_field_vals[] = { +static const value_string bat_ase_action_indicator_field_vals[] = { { 0x00, "no indication"}, { 0x01, "connect backward"}, @@ -2845,7 +2845,7 @@ static const true_false_string BCTP_BVEI_value = { "No indication" }; -static value_string BCTP_Tunnelled_Protocol_Indicator_vals[] = { +static const value_string BCTP_Tunnelled_Protocol_Indicator_vals[] = { { 0x20, "IPBCP (text encoded)"}, { 0x21, "spare (text encoded protocol)"}, diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index b90b711c2a..92452cf70f 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -117,7 +117,7 @@ typedef enum { LMP_MSG_DISCOVERY_RESP_NACK } lmp_message_types; -static value_string message_type_vals[] = { +static const value_string message_type_vals[] = { {LMP_MSG_CONFIG, "Config Message. "}, {LMP_MSG_CONFIG_ACK, "ConfigAck Message. "}, {LMP_MSG_CONFIG_NACK, "ConfigNack Message. "}, @@ -186,7 +186,7 @@ static value_string message_type_vals[] = { #define LMP_CLASS_LOCAL_LAD_INFO 249 #define LMP_CLASS_MAX 250 -static value_string lmp_class_vals[] = { +static const value_string lmp_class_vals[] = { {LMP_CLASS_CCID, "CCID"}, {LMP_CLASS_NODE_ID, "NODE_ID"}, diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 0f5978a2f1..368c05b073 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -173,7 +173,7 @@ static const value_string burst_command[] = { */ -static value_string ncp_type_vals[] = { +static const value_string ncp_type_vals[] = { { NCP_ALLOCATE_SLOT, "Create a service connection" }, { NCP_SERVICE_REQUEST, "Service request" }, { NCP_SERVICE_REPLY, "Service reply" }, @@ -186,7 +186,7 @@ static value_string ncp_type_vals[] = { { 0, NULL } }; -static value_string ncp_oplock_vals[] = { +static const value_string ncp_oplock_vals[] = { { 0x21, "Message Waiting" }, { 0x24, "Clear Op-lock" }, { 0, NULL } diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index ff56b276f7..596fed6e5c 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -2708,7 +2708,7 @@ dissect_v9_template(proto_tree * pdutree, tvbuff_t * tvb, int offset, int len, h return (0); } -static value_string v9_template_types[] = { +static const value_string v9_template_types[] = { { 1, "BYTES" }, { 2, "PKTS" }, { 3, "FLOWS" }, @@ -2910,7 +2910,7 @@ static value_string v9_template_types[] = { { 0, NULL } }; -static value_string v9_scope_field_types[] = { +static const value_string v9_scope_field_types[] = { { 1, "System" }, { 2, "Interface" }, { 3, "Line Card" }, @@ -2925,18 +2925,18 @@ decode_v9_template_types(int type) { return ((v==NULL)?"Unknown" : v); } -static value_string v9_sampler_mode[] = { +static const value_string v9_sampler_mode[] = { { 0, "Determinist" }, { 1, "Unknown" }, { 2, "Random" }, { 0, NULL } }; -static value_string v9_direction[] = { +static const value_string v9_direction[] = { { 0, "Ingress" }, { 1, "Egress" }, { 0, NULL } }; -static value_string v9_forwarding_status[] = { +static const value_string v9_forwarding_status[] = { { 0, "Unknown"}, /* Observed on IOS-XR 3.2 */ { 1, "Forward"}, /* Observed on 7200 12.4(9)T */ { 2, "Drop"}, /* Observed on 7200 12.4(9)T */ diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c index 43a605b63b..eac62d972f 100644 --- a/epan/dissectors/packet-nt-sonmp.c +++ b/epan/dissectors/packet-nt-sonmp.c @@ -50,7 +50,7 @@ /* chassis types */ /* From synro199.mib - SnpxChassisType */ -static value_string sonmp_chassis_val[] = +static const value_string sonmp_chassis_val[] = { {2, "m3000"}, {3, "m3030"}, @@ -163,7 +163,7 @@ static value_string sonmp_chassis_val[] = }; /* from synro179.mib - SnpxBackplaneType */ -static value_string sonmp_backplane_val[] = +static const value_string sonmp_backplane_val[] = { {1, "Other"}, {2, "ethernet"}, @@ -180,7 +180,7 @@ static value_string sonmp_backplane_val[] = {0, NULL} }; -static value_string sonmp_nmm_state_val[] = +static const value_string sonmp_nmm_state_val[] = { {1, "Topology Change"}, {2, "Heartbeat"}, diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index 95087ed099..e02851533c 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1144,7 +1144,7 @@ dissect_q933_link_integrity_verf_ie(tvbuff_t *tvb, int offset, int len, /* * Dissect a PVC status information element. */ -static value_string q933_pvc_status_vals[] = { +static const value_string q933_pvc_status_vals[] = { {0x00, "Inactive"}, {0x02, "Active"}, {0x08, "New"}, diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 8d3121abfe..387fc59ac2 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -147,7 +147,7 @@ static guint32 packetcable_qos_desc_mask[] = PACKETCABLE_MAXIMUM_DOWNSTREAM_LATENCY_MASK }; -static value_string radius_vendor_packetcable_event_message_vals[] = +static const value_string radius_vendor_packetcable_event_message_vals[] = { {0, "Reserved"}, {1, "Signaling_Start"}, @@ -175,7 +175,7 @@ static value_string radius_vendor_packetcable_event_message_vals[] = {0, NULL} }; -static value_string packetcable_em_header_element_type_vals[] = +static const value_string packetcable_em_header_element_type_vals[] = { {0, "Reserved"}, {1, "CMS"}, @@ -185,7 +185,7 @@ static value_string packetcable_em_header_element_type_vals[] = {0, NULL} }; -static value_string packetcable_em_header_status_error_indicator_vals[] = +static const value_string packetcable_em_header_status_error_indicator_vals[] = { {0, "No Error"}, {1, "Possible Error"}, @@ -194,21 +194,21 @@ static value_string packetcable_em_header_status_error_indicator_vals[] = {0, NULL} }; -static value_string packetcable_em_header_status_event_origin_vals[] = +static const value_string packetcable_em_header_status_event_origin_vals[] = { {0, "Trusted Element"}, {1, "Untrusted Element"}, {0, NULL} }; -static value_string packetcable_em_header_status_event_message_proxied_vals[] = +static const value_string packetcable_em_header_status_event_message_proxied_vals[] = { {0, "Not proxied"}, {1, "Proxied"}, {0, NULL} }; -static value_string packetcable_call_termination_cause_vals[] = +static const value_string packetcable_call_termination_cause_vals[] = { {0, "Reserved"}, {1, "BAF"}, @@ -216,7 +216,7 @@ static value_string packetcable_call_termination_cause_vals[] = {0, NULL} }; -static value_string packetcable_trunk_type_vals[] = +static const value_string packetcable_trunk_type_vals[] = { {1, "Not Used"}, {2, "Not Used"}, @@ -228,7 +228,7 @@ static value_string packetcable_trunk_type_vals[] = {0, NULL} }; -static value_string packetcable_state_indication_vals[] = +static const value_string packetcable_state_indication_vals[] = { {0, "Illegal Value"}, {1, "Resource Reserved but not Activated"}, diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index c13af6a18f..4b23803e3a 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -132,7 +132,7 @@ static const value_string rpc_authgssapi_proc[] = { { 0, NULL } }; -value_string rpc_authgss_svc[] = { +const value_string rpc_authgss_svc[] = { { RPCSEC_GSS_SVC_NONE, "rpcsec_gss_svc_none" }, { RPCSEC_GSS_SVC_INTEGRITY, "rpcsec_gss_svc_integrity" }, { RPCSEC_GSS_SVC_PRIVACY, "rpcsec_gss_svc_privacy" }, diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h index 39d52bee1c..471407e545 100644 --- a/epan/dissectors/packet-rpc.h +++ b/epan/dissectors/packet-rpc.h @@ -93,7 +93,7 @@ #define AUTHDES_NAMEKIND_FULLNAME 0 #define AUTHDES_NAMEKIND_NICKNAME 1 -extern value_string rpc_authgss_svc[]; +extern const value_string rpc_authgss_svc[]; typedef enum { FLAVOR_UNKNOWN, /* authentication flavor unknown */ FLAVOR_NOT_GSSAPI, /* flavor isn't GSSAPI */ diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 26a4aea65b..02f5e8e761 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -301,7 +301,7 @@ typedef enum { /* [SBM] is Subnet Bandwidth Manager ID from July 1997 */ } rsvp_message_types; -static value_string message_type_vals[] = { +static const value_string message_type_vals[] = { {RSVP_MSG_PATH, "PATH Message. "}, {RSVP_MSG_RESV, "RESV Message. "}, {RSVP_MSG_PERR, "PATH ERROR Message. "}, @@ -421,7 +421,7 @@ enum rsvp_classes { }; -static value_string rsvp_class_vals[] = { +static const value_string rsvp_class_vals[] = { {RSVP_CLASS_NULL, "NULL object"}, {RSVP_CLASS_SESSION, "SESSION object"}, {RSVP_CLASS_HOP, "HOP object"}, @@ -558,7 +558,7 @@ enum { RSVP_DSTE_ERROR_INCONSISTENCY_PHB_CT }; -static value_string rsvp_error_codes[] = { +static const value_string rsvp_error_codes[] = { {RSVP_ERROR_CONFIRM, "Confirmation"}, {RSVP_ERROR_ADMISSION, "Admission Control Failure "}, {RSVP_ERROR_POLICY, "Policy Control Failure"}, @@ -581,14 +581,14 @@ static value_string rsvp_error_codes[] = { {0, NULL} }; -static value_string rsvp_admission_control_error_vals[] = { +static const value_string rsvp_admission_control_error_vals[] = { {RSVP_AC_ERROR_DELAY_BOUND_ERROR, "Delay bound cannot be met"}, {RSVP_AC_ERROR_BANDWITH_UNAVAILABLE, "Requested bandwidth unavailable"}, {RSVP_AC_ERROR_LARGE_MTU, "MTU in flowspec larger than interface MTU"}, {0, NULL} }; -static value_string rsvp_traffic_control_error_vals[] = { +static const value_string rsvp_traffic_control_error_vals[] = { {RSVP_TRAFFIC_CONTROL_ERROR_SERVICE_CONFLICT, "Service conflict"}, {RSVP_TRAFFIC_CONTROL_ERROR_SERVIEC_UNSUPPORTED, "Service unsupported"}, {RSVP_TRAFFIC_CONTROL_ERROR_BAD_FLOWSPEC, "Bad Flowspec value"}, @@ -597,7 +597,7 @@ static value_string rsvp_traffic_control_error_vals[] = { {0, NULL} }; -static value_string rsvp_routing_error_vals[] = { +static const value_string rsvp_routing_error_vals[] = { {RSVP_ROUTING_ERROR_BAD_ERO, "Bad EXPLICIT_ROUTE object"}, {RSVP_ROUTING_ERROR_BAD_STRICT, "Bad strict node"}, {RSVP_ROUTING_ERROR_BAD_LOOSE, "Bad loose node"}, @@ -611,7 +611,7 @@ static value_string rsvp_routing_error_vals[] = { {0, NULL} }; -static value_string rsvp_notify_error_vals[] = { +static const value_string rsvp_notify_error_vals[] = { {RSVP_NOTIFY_ERROR_RRO_TOO_LARGE, "RRO too large for MTU"}, {RSVP_NOTIFY_ERROR_RRO_NOTIFICATION, "RRO Notification"}, {RSVP_NOTIFY_ERROR_RRO_TUNNEL_LOCAL_REPAIRED, "Tunnel locally repaired"}, @@ -623,7 +623,7 @@ static value_string rsvp_notify_error_vals[] = { {0, NULL} }; -static value_string rsvp_diffserv_error_vals[] = { +static const value_string rsvp_diffserv_error_vals[] = { {RSVP_DIFFSERV_ERROR_UNEXPECTED_DIFFSERVOBJ, "Unexpected DIFFSERV object"}, {RSVP_DIFFSERV_ERROR_UNSUPPORTED_PHB, "Unsupported PHB"}, {RSVP_DIFFSERV_ERROR_INVALID_EXP_PHB_MAPPING, "Invalid `EXP<->PHB mapping'"}, @@ -633,7 +633,7 @@ static value_string rsvp_diffserv_error_vals[] = { }; /* FF: RFC4124 */ -static value_string rsvp_diffserv_aware_te_error_vals[] = { +static const value_string rsvp_diffserv_aware_te_error_vals[] = { {RSVP_DSTE_ERROR_UNEXPECTED_CLASSTYPEOBJ, "Unexpected CLASSTYPE object"}, {RSVP_DSTE_ERROR_UNSUPPORTED_CLASSTYPE, "Unsupported Class-Type"}, {RSVP_DSTE_ERROR_INVALID_CLASSTYPE_VALUE, "Invalid Class-Type value"}, @@ -662,7 +662,7 @@ static value_string rsvp_diffserv_aware_te_error_vals[] = { #define RSVP_FF (RSVP_DISTINCT | RSVP_SCOPE_EXPLICIT) #define RSVP_SE (RSVP_SHARED | RSVP_SCOPE_EXPLICIT) -static value_string style_vals[] = { +static const value_string style_vals[] = { { RSVP_WF, "Wildcard Filter" }, { RSVP_FF, "Fixed Filter" }, { RSVP_SE, "Shared-Explicit" }, @@ -694,7 +694,7 @@ enum qos_service_type { QOS_TSPEC = 1 /* Traffic specification */ }; -static value_string qos_vals[] = { +static const value_string qos_vals[] = { { QOS_QUALITATIVE, "Qualitative QoS" }, { QOS_NULL, "Null-Service QoS" }, { QOS_CONTROLLED_LOAD, "Controlled-load QoS" }, @@ -703,7 +703,7 @@ static value_string qos_vals[] = { { 0, NULL } }; -static value_string svc_vals[] = { +static const value_string svc_vals[] = { { 126, "Compression Hint" }, { 127, "Token bucket" }, { 128, "Null Service" }, @@ -721,7 +721,7 @@ enum intsrv_services { INTSRV_QUALITATIVE = 128 }; -static value_string intsrv_services_str[] = { +static const value_string intsrv_services_str[] = { {INTSRV_GENERAL, "Default General Parameters"}, {INTSRV_GTD, "Guaranteed Rate"}, {INTSRV_CLOAD, "Controlled Load"}, @@ -751,7 +751,7 @@ enum intsrv_field_name { }; #endif -static value_string adspec_params[] = { +static const value_string adspec_params[] = { {4, "IS Hop Count"}, {6, "Path b/w estimate"}, {8, "Minimum path latency"}, @@ -2117,7 +2117,7 @@ dissect_rsvp_error_value (proto_tree *ti, tvbuff_t *tvb, int offset, guint8 error_code) { guint16 error_val; - value_string *rsvp_error_vals = NULL; + const value_string *rsvp_error_vals = NULL; error_val = tvb_get_ntohs(tvb, offset); switch (error_code) { @@ -3564,7 +3564,7 @@ dissect_rsvp_label_set (proto_item *ti, proto_tree *rsvp_object_tree, guint8 label_type; int len, i; - static value_string action_type_vals[] = { + static const value_string action_type_vals[] = { {0, "Inclusive list"}, {1, "Exclusive list"}, {2, "Inclusive range"}, @@ -4356,7 +4356,7 @@ dissect_rsvp_association (proto_tree *ti, proto_tree *rsvp_object_tree, { guint16 association_type; guint16 association_id; - static value_string association_type_vals[] = { + static const value_string association_type_vals[] = { {0, "Reserved"}, {1, "Recovery"}, { 0, NULL} @@ -5000,7 +5000,7 @@ dissect_rsvp_call_id (proto_tree *ti, proto_tree *rsvp_object_tree, int offset2 = offset + 4; int offset3, offset4, len; - static value_string address_type_vals[] = { + static const value_string address_type_vals[] = { {1, "1 (IPv4)"}, {2, "2 (IPv6)"}, {3, "3 (NSAP)"}, diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index b0441f2156..5550920c61 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -57,7 +57,7 @@ static gint ett_tr_ierr_cnt = -1; static gint ett_tr_nerr_cnt = -1; /* Major Vector */ -static value_string major_vector_vs[] = { +static const value_string major_vector_vs[] = { { 0x00, "Response" }, { 0x02, "Beacon" }, { 0x03, "Claim Token" }, @@ -86,7 +86,7 @@ static value_string major_vector_vs[] = { }; /* Src. and Dest. Classes */ -static value_string classes_vs[] = { +static const value_string classes_vs[] = { { 0x00, "Ring Station" }, { 0x01, "LLC Manager" }, { 0x04, "Configuration Report Server" }, |