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-slsk.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-slsk.c')
| -rw-r--r-- | epan/dissectors/packet-slsk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index eac8ea8523..4bb7ba49fa 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -372,8 +372,8 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree "Message Type: %s (Code: %02d)", message_type, msg_code); offset += 4; i=tvb_get_guint8(tvb, offset); - proto_tree_add_uint_format(slsk_tree, hf_slsk_login_successful, tvb, offset, 1, tvb_get_guint8(tvb, offset), - "Login successful: %s (Byte: %d)", val_to_str_const(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset)); + proto_tree_add_uint_format_value(slsk_tree, hf_slsk_login_successful, tvb, offset, 1, tvb_get_guint8(tvb, offset), + "%s (Byte: %d)", val_to_str_const(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset)); offset += 1; proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset)); proto_tree_add_item(slsk_tree, hf_slsk_login_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA); @@ -444,8 +444,8 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset)); proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA); offset += 4+tvb_get_letohl(tvb, offset); - proto_tree_add_uint_format(slsk_tree, hf_slsk_user_exists, tvb, offset, 1, tvb_get_guint8(tvb, offset), - "User exists: %s (Byte: %d)", val_to_str_const(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset)); + proto_tree_add_uint_format_value(slsk_tree, hf_slsk_user_exists, tvb, offset, 1, tvb_get_guint8(tvb, offset), + "%s (Byte: %d)", val_to_str_const(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset)); offset += 1; } else if (check_slsk_format(tvb, offset, "is")) { @@ -2448,7 +2448,7 @@ proto_register_slsk(void) { "IP Address", "slsk.ip.address", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_user_exists, - { "user exists", "slsk.user.exists", + { "User exists", "slsk.user.exists", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_status_code, { "Status Code", "slsk.status.code", |