diff options
| author | Jakub Zawadzki <darkjames@darkjames.pl> | 2014-05-18 09:56:20 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-05-19 02:27:12 +0000 |
| commit | d7bd2ecf9fc2c627d236484cee8e77e84697da07 (patch) | |
| tree | 61d077a4d18f23569dd3beb7596beb242962fe70 /epan/dissectors/packet-xml.c | |
| parent | e6d6183e1bee841fa65619ddd61329c7ea91b3f7 (diff) | |
Add new proto_tree_add_format_text() function
There are lot of text dissectors which want just to add escaped (not filtrable) text,
add new function proto_tree_add_format_text() which just do this in optimized way.
Change-Id: Ia0e189b620cc0a5b74cfdaef1ad4571d766bb2ab
Reviewed-on: https://code.wireshark.org/review/1678
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-xml.c')
| -rw-r--r-- | epan/dissectors/packet-xml.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 8c96e9c0b2..5e4bfb9281 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -393,9 +393,7 @@ static void after_xmlpi(void *tvbparse_data, const void *wanted_data _U_, tvbpar GPtrArray *stack = (GPtrArray *)tvbparse_data; xml_frame_t *current_frame = (xml_frame_t *)g_ptr_array_index(stack, stack->len - 1); - proto_tree_add_text(current_frame->tree, - tok->tvb, tok->offset, tok->len, "%s", - tvb_format_text(tok->tvb, tok->offset, tok->len)); + proto_tree_add_format_text(current_frame->tree, tok->tvb, tok->offset, tok->len); if (stack->len > 1) { g_ptr_array_remove_index_fast(stack, stack->len - 1); @@ -507,8 +505,7 @@ static void after_untag(void *tvbparse_data, const void *wanted_data _U_, tvbpar proto_item_set_len(current_frame->item, (tok->offset - current_frame->start_offset) + tok->len); - proto_tree_add_text(current_frame->tree, tok->tvb, tok->offset, tok->len, "%s", - tvb_format_text(tok->tvb, tok->offset, tok->len)); + proto_tree_add_format_text(current_frame->tree, tok->tvb, tok->offset, tok->len); if (stack->len > 1) { g_ptr_array_remove_index_fast(stack, stack->len - 1); |