diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-30 15:21:09 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-30 15:21:09 +0000 |
| commit | cf804429123802edb55003ebfd21ebea5718d10b (patch) | |
| tree | d2a468c4f0aeb706413a6c50c2e12026673a6b34 /epan/dissectors/packet-x11.c | |
| parent | 2211ab0fba17d71cc25f6b0d026f04d241bbced1 (diff) | |
Convert some proto_tree_add_string_format calls to something more appropriate.
There seem to be several cases of proto_tree_add_string_format where a "string" value/filter doesn't really make sense because it's always empty, and is just being used as a "filterable subtree header (placeholder)". They appear to be more for "presense" than "value" and should probably be FT_NONE, although I'd almost argue for removing the filter in favor of proto_tree_add_text.
svn path=/trunk/; revision=52296
Diffstat (limited to 'epan/dissectors/packet-x11.c')
| -rw-r--r-- | epan/dissectors/packet-x11.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 703547ae97..209be44dc3 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -2152,10 +2152,9 @@ static void string16_with_buffer_preallocated(tvbuff_t *tvb, proto_tree *t, if (truncated) { *dp++ = '.'; *dp++ = '.'; *dp++ = '.'; } *dp++ = '\0'; - proto_tree_add_string_format(t, hf, tvb, offset, length, + proto_tree_add_string_format_value(t, hf, tvb, offset, length, (const gchar *)tvb_get_ptr(tvb, offset, length), - "%s: %s", - proto_registrar_get_nth(hf) -> name, + "%s", *s); } else proto_tree_add_item(t, hf_bytes, tvb, offset, length, byte_order); |