aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/interlink
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2010-03-16 07:53:48 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2010-03-16 07:53:48 +0000
commit2dc49da00d9dcb15089a37a40ddfea1e95e4abc2 (patch)
treeb27ebabdfd38d8bc9589a6c6ae33ce52df173ec7 /plugins/interlink
parent4d2163dd3b9cfedbf6370b0f737cdfe2459236aa (diff)
Some if (tree) cleanup
svn path=/trunk/; revision=32207
Diffstat (limited to 'plugins/interlink')
-rw-r--r--plugins/interlink/packet-interlink.c40
1 files changed, 19 insertions, 21 deletions
diff --git a/plugins/interlink/packet-interlink.c b/plugins/interlink/packet-interlink.c
index a6541e6d47..97250f41ae 100644
--- a/plugins/interlink/packet-interlink.c
+++ b/plugins/interlink/packet-interlink.c
@@ -98,18 +98,17 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ilh_tree = proto_item_add_subtree(ilh_item, ett_interlink_header);
}
- if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_id,
- tvb, offset, 4, FALSE);
- offset += 4;
- if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_version,
- tvb, offset, 2, TRUE);
- offset += 2;
- if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_cmd,
- tvb, offset, 2, TRUE);
- offset += 2;
- if (ilh_tree) proto_tree_add_item(ilh_tree, hf_interlink_seq,
- tvb, offset, 2, TRUE);
- offset += 2;
+ if (ilh_tree) {
+ proto_tree_add_item(ilh_tree, hf_interlink_id, tvb, offset, 4, FALSE);
+ offset += 4;
+ proto_tree_add_item(ilh_tree, hf_interlink_version, tvb, offset, 2, TRUE);
+ offset += 2;
+ proto_tree_add_item(ilh_tree, hf_interlink_cmd, tvb, offset, 2, TRUE);
+ offset += 2;
+ proto_tree_add_item(ilh_tree, hf_interlink_seq, tvb, offset, 2, TRUE);
+ offset += 2;
+ }
+
if (ilh_tree) {
proto_item *flags_item;
proto_tree *flags_tree = NULL;
@@ -141,15 +140,14 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_append_fstr(pinfo->cinfo, COL_INFO, "Type: 0x%02x, Version: %d",
ilb_type, ilb_version);
- if (ilb_tree) proto_tree_add_item(ilb_tree, hf_interlink_block_type,
- tvb, offset, 1, FALSE);
- offset += 1;
- if (ilb_tree) proto_tree_add_item(ilb_tree, hf_interlink_block_version,
- tvb, offset, 1, FALSE);
- offset += 1;
- if (ilb_tree) proto_tree_add_item(ilb_tree, hf_interlink_block_length,
- tvb, offset, 2, TRUE);
- offset += 2;
+ if (ilb_tree) {
+ proto_tree_add_item(ilb_tree, hf_interlink_block_type, tvb, offset, 1, FALSE);
+ offset += 1;
+ proto_tree_add_item(ilb_tree, hf_interlink_block_version, tvb, offset, 1, FALSE);
+ offset += 1;
+ proto_tree_add_item(ilb_tree, hf_interlink_block_length, tvb, offset, 2, TRUE);
+ offset += 2;
+ }
/* Generate a new tvb for the rest. */
next_tvb = tvb_new_subset_remaining(tvb, offset);