osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

marker: return unused offset (found by clang). 

Remove if (tree) as well.

Change-Id: I618ce6e081eced8c5bf0a8d3e8acb7476538e841
Reviewed-on: https://code.wireshark.org/review/25883
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo 2018-02-18 18:26:46 +01:00
parent bd9d79fcd7
commit 44a6e2dea8
1 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-marker.c
View File

@ -66,12 +66,9 @@ dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
proto_tree *marker_tree;
proto_item *marker_item, *tlv_type_item, *tlv_length_item, *pad_item;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Marker");
col_set_str(pinfo->cinfo, COL_INFO, "Marker Protocol");
if (tree)
{
marker_item = proto_tree_add_protocol_format(tree, proto_marker, tvb,
0, -1, "Marker Protocol");
marker_tree = proto_item_add_subtree(marker_item, ett_marker);
@ -140,8 +137,7 @@ dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
proto_tree_add_item(marker_tree, hf_marker_reserved, tvb,
offset, 90, ENC_NA);
offset += 90;
}
return tvb_captured_length(tvb);
return offset;
}
/* Register the protocol with Wireshark */