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

mrdisc: remove unnecessary if(item) checks 

Change-Id: I9eb9b95274630a206a6f7036ee4b78a036ea56f1
Reviewed-on: https://code.wireshark.org/review/13461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2016-01-20 22:28:58 +01:00
parent 92f76d0b69
commit 8c2af23c16
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-mrdisc.c
View File

@ -124,11 +124,9 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i
switch (type) {
case MRDISC_QI:
if (item) {
proto_item_set_text(item,"Option: %s == %d",
proto_item_set_text(item,"Option: %s == %d",
val_to_str(type, mrdisc_options, "unknown %x"),
tvb_get_ntohs(tvb, offset));
}
if (len != 2)
THROW(ReportedBoundsError);
@ -137,11 +135,9 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i
offset += len;
break;
case MRDISC_RV:
if (item) {
proto_item_set_text(item,"Option: %s == %d",
proto_item_set_text(item,"Option: %s == %d",
val_to_str(type, mrdisc_options, "unknown %x"),
tvb_get_ntohs(tvb, offset));
}
if (len != 2)
THROW(ReportedBoundsError);
@ -150,17 +146,13 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i
offset += len;
break;
default:
if (item) {
proto_item_set_text(item,"Option: unknown");
}
proto_item_set_text(item,"Option: unknown");
proto_tree_add_item(tree, hf_option_bytes,
tvb, offset, len, ENC_NA);
offset += len;
}
if (item) {
proto_item_set_len(item, offset-old_offset);
}
proto_item_set_len(item, offset-old_offset);
}
return offset;