aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2014-06-21 10:09:58 -0700
committerMartin Kaiser <wireshark@kaiser.cx>2014-06-22 03:51:53 +0000
commit2aae7caa5d5d998e06c98bf8299ae949575408eb (patch)
treeadd1cf924b274652d68bd64ddafca19d3d8c4862 /epan
parentdfa7337b3acbb90637cd17252a0d605b6faeb3e2 (diff)
create the iso descriptor tree's title in a simpler way
Change-Id: I4e60295208c2ac35a452f5fb3dffd090cc151473 Reviewed-on: https://code.wireshark.org/review/2535 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-usb.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 18a3eb8458..4ed25b42d9 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -3089,14 +3089,10 @@ dissect_linux_usb_iso_transfer(packet_info *pinfo _U_, proto_tree *tree,
if (parent) {
proto_item *ti;
- if (iso_len > 0) {
- ti = proto_tree_add_protocol_format(urb_tree, proto_usb, tvb, offset,
- 16, "USB isodesc %u [%s] (%u bytes)", i,
- val_to_str_ext(iso_status, &usb_urb_status_vals_ext, "Error %d"), iso_len);
- } else {
- ti = proto_tree_add_protocol_format(urb_tree, proto_usb, tvb, offset,
- 16, "USB isodesc %u [%s]", i, val_to_str_ext(iso_status, &usb_urb_status_vals_ext, "Error %d"));
- }
+ ti = proto_tree_add_protocol_format(urb_tree, proto_usb, tvb, offset,
+ 16, "USB isodesc %u [%s]", i, val_to_str_ext(iso_status, &usb_urb_status_vals_ext, "Error %d"));
+ if (iso_len > 0)
+ proto_item_append_text(ti, " (%u bytes)", iso_len);
tree = proto_item_add_subtree(ti, usb_isodesc);
}