diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-08-25 01:20:32 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-08-25 01:20:32 +0000 |
| commit | a581f3156924197468b2eaad0fcc984a5e451dc4 (patch) | |
| tree | 09f8735406ef453ca4e46fe3e3ccbb48a01a2b88 | |
| parent | d888dd950ec17909e8e576e156ba46cb372f44a3 (diff) | |
Extern (and use) extended value string instead of the associated value string array.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44665 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-lmp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-rsvp.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 461ecdc06e..f20cec477d 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -1956,8 +1956,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) for (j = 0; j < (mylen - 8) / 4; j++) { proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8+(j*4), 4, "%s: %d free timeslots", - val_to_str(tvb_get_guint8(tvb, offset2+l+8+(j*4)), - gmpls_sonet_signal_type_str, + val_to_str_ext(tvb_get_guint8(tvb, offset2+l+8+(j*4)), + &gmpls_sonet_signal_type_str_ext, "Unknown Signal Type (%d)"), tvb_get_ntoh24(tvb, offset2+l+9+(j*4))); } diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 3976ee0286..38c917caec 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -2196,9 +2196,9 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, for (i = 0; i < (stlv_len - 4) / 4; i++) { proto_tree_add_text(stlv_tree, tvb, stlv_offset+8+(i*4), 4, "%s: %d free timeslots", - val_to_str(tvb_get_guint8(tvb, stlv_offset+8+(i*4)), - gmpls_sonet_signal_type_str, - "Unknown Signal Type (%d)"), + val_to_str_ext(tvb_get_guint8(tvb, stlv_offset+8+(i*4)), + &gmpls_sonet_signal_type_str_ext, + "Unknown Signal Type (%d)"), tvb_get_ntoh24(tvb, stlv_offset + 9 + i*4)); } diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 21e228bef8..3f07caa712 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -1067,11 +1067,11 @@ const value_string gmpls_protection_cap_str[] = { { 16, "Dedicated 1+1"}, { 32, "Enhanced"}, { 64, "Reserved"}, - { 128,"Reserved"}, + { 128, "Reserved"}, { 0, NULL } }; -const value_string gmpls_sonet_signal_type_str[] = { +static const value_string gmpls_sonet_signal_type_str[] = { { 1, "VT1.5 SPE / VC-11"}, { 2, "VT2 SPE / VC-12"}, { 3, "VT3 SPE"}, @@ -1100,7 +1100,7 @@ const value_string gmpls_sonet_signal_type_str[] = { { 23, "STS-192c SPE / VC-4-64c"}, { 0, NULL} }; -static value_string_ext gmpls_sonet_signal_type_str_ext = VALUE_STRING_EXT_INIT(gmpls_sonet_signal_type_str); +value_string_ext gmpls_sonet_signal_type_str_ext = VALUE_STRING_EXT_INIT(gmpls_sonet_signal_type_str); static const value_string ouni_guni_diversity_str[] = { { 1, "Node Diverse"}, diff --git a/epan/dissectors/packet-rsvp.h b/epan/dissectors/packet-rsvp.h index 2ba5f88579..b0a7fcd8a9 100644 --- a/epan/dissectors/packet-rsvp.h +++ b/epan/dissectors/packet-rsvp.h @@ -41,6 +41,6 @@ typedef struct rsvp_conversation_info extern const range_string gmpls_switching_type_rvals[]; extern const range_string gmpls_lsp_enc_rvals[]; extern const value_string gmpls_protection_cap_str[]; -extern const value_string gmpls_sonet_signal_type_str[]; +extern value_string_ext gmpls_sonet_signal_type_str_ext; #endif |