diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-08-01 10:08:57 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-08-03 16:30:10 +0000 |
| commit | 5db1352526e71727091ff0e1c0e97821eec4e4cb (patch) | |
| tree | 01f836967616b7ae8b2840c488b500c7ff13d55c /epan/dissectors/packet-collectd.c | |
| parent | 3fa5625ea074908d5617111a7edfcf6d95e6108a (diff) | |
Eliminate proto_tree_add_text from some dissectors.
Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f
Reviewed-on: https://code.wireshark.org/review/3319
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-collectd.c')
| -rw-r--r-- | epan/dissectors/packet-collectd.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 08d90cf004..f3175f162d 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -376,13 +376,14 @@ dissect_collectd_string (tvbuff_t *tvb, packet_info *pinfo, gint type_hf, type = tvb_get_ntohs(tvb, offset); length = tvb_get_ntohs(tvb, offset + 2); + pt = proto_tree_add_subtree_format(tree_root, tvb, offset, length, + ett_collectd_string, &pi, "collectd %s segment: ", + val_to_str_const (type, part_names, "UNKNOWN")); + if (length > size) { - pi = proto_tree_add_text (tree_root, tvb, offset, length, - "collectd %s segment: Length = %i <BAD>", - val_to_str_const (type, part_names, "UNKNOWN"), - length); - expert_add_info_format(pinfo, pi, &ei_collectd_invalid_length, + proto_item_append_text(pt, "Length = %i <BAD>", length); + expert_add_info_format(pinfo, pt, &ei_collectd_invalid_length, "String part with invalid part length: " "Part is longer than rest of package."); return (-1); @@ -392,11 +393,7 @@ dissect_collectd_string (tvbuff_t *tvb, packet_info *pinfo, gint type_hf, *ret_length = length - 4; *ret_string = tvb_get_string_enc(wmem_packet_scope(), tvb, *ret_offset, *ret_length, ENC_ASCII); - - pt = proto_tree_add_subtree_format(tree_root, tvb, offset, length, - ett_collectd_string, &pi, "collectd %s segment: \"%s\"", - val_to_str_const (type, part_names, "UNKNOWN"), - *ret_string); + proto_item_append_text(pt, "\"%s\"", *ret_string); if (ret_item != NULL) *ret_item = pi; |