diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-16 10:39:06 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-16 10:39:06 +0000 |
| commit | 346f803d42ac477109e02df2578eb8c86ccf4c4f (patch) | |
| tree | 4277e1e48aeb6d492ceb835af645460070fb04ec /epan/dissectors/packet-e212.c | |
| parent | 58e4750ecbf593fb678c713da398979b7fb2ed5d (diff) | |
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string
There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.
svn path=/trunk/; revision=52098
Diffstat (limited to 'epan/dissectors/packet-e212.c')
| -rw-r--r-- | epan/dissectors/packet-e212.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index e9401f49ef..1632131f50 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -2545,8 +2545,8 @@ dissect_e212_mcc_mnc_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t expert_add_info(pinfo, item, &ei_E212_mcc_non_decimal); if (long_mnc) { - item = proto_tree_add_uint_format(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, - "Mobile Network Code (MNC): %s (%03u)", + item = proto_tree_add_uint_format_value(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, + "%s (%03u)", val_to_str_ext_const(mcc * 1000 + mnc, &mcc_mnc_codes_ext, "Unknown"), mnc); /* Prepare a string with the MCC and MNC including the country and Operator if @@ -2558,8 +2558,8 @@ dissect_e212_mcc_mnc_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t mnc, val_to_str_ext_const(mcc * 1000 + mnc, &mcc_mnc_codes_ext, "")); } else { - item = proto_tree_add_uint_format(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, - "Mobile Network Code (MNC): %s (%02u)", + item = proto_tree_add_uint_format_value(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, + "%s (%02u)", val_to_str_ext_const(mcc * 1000 + 10 * mnc, &mcc_mnc_codes_ext, "Unknown"), mnc); /* Prepare a string with the MCC and MNC including the country and Operator if @@ -2668,13 +2668,13 @@ dissect_e212_mcc_mnc_in_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t expert_add_info(pinfo, item, &ei_E212_mcc_non_decimal); if (long_mnc) - item = proto_tree_add_uint_format(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, - "Mobile Network Code (MNC): %s (%03u)", + item = proto_tree_add_uint_format_value(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, + "%s (%03u)", val_to_str_ext_const(mcc * 1000 + mnc, &mcc_mnc_codes_ext, "Unknown"), mnc); else - item = proto_tree_add_uint_format(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, - "Mobile Network Code (MNC): %s (%02u)", + item = proto_tree_add_uint_format_value(tree, hf_E212_mnc , tvb, start_offset + 1, 2, mnc, + "%s (%02u)", val_to_str_ext_const(mcc * 1000 + 10 * mnc, &mcc_mnc_codes_ext, "Unknown"), mnc); @@ -2707,7 +2707,7 @@ proto_register_e212(void) "Mobile Country Code MCC", HFILL } }, { &hf_E212_mnc, - { "Mobile network code (MNC)","e212.mnc", + { "Mobile Network Code (MNC)","e212.mnc", FT_UINT16, BASE_DEC, NULL, 0x0, "Mobile network code", HFILL } }, |