diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-22 16:01:36 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-22 21:07:16 +0000 |
| commit | 188aa9a80eea47842988f1b860931d25e1ca08bd (patch) | |
| tree | 9b6faf83e26edb43fe6befe6d2ff01c4b6daaa89 /epan/dissectors/packet-bofl.c | |
| parent | 3fc441e7a5008640c68ec985e669d5092414a519 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df
Reviewed-on: https://code.wireshark.org/review/2560
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bofl.c')
| -rw-r--r-- | epan/dissectors/packet-bofl.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 9eb9308e6d..96be5eb8ea 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -63,7 +63,7 @@ static void dissect_bofl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; - proto_tree *bofl_tree = NULL; + proto_tree *bofl_tree; gint len; guint32 pdu, sequence; @@ -71,29 +71,25 @@ dissect_bofl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); - if (tree) { - ti = proto_tree_add_item(tree, proto_bofl, tvb, 0, -1, ENC_NA); - bofl_tree = proto_item_add_subtree(ti, ett_bofl); - } + ti = proto_tree_add_item(tree, proto_bofl, tvb, 0, -1, ENC_NA); + bofl_tree = proto_item_add_subtree(ti, ett_bofl); pdu = tvb_get_ntohl(tvb, 0); col_add_fstr(pinfo->cinfo, COL_INFO, "PDU: 0x%08x", pdu); - if (tree) - proto_tree_add_uint(bofl_tree, hf_bofl_pdu, tvb, 0, 4, pdu); + proto_tree_add_uint(bofl_tree, hf_bofl_pdu, tvb, 0, 4, pdu); sequence = tvb_get_ntohl(tvb, 4); col_append_fstr(pinfo->cinfo, COL_INFO, " Sequence: %u", sequence); - if (tree) { - proto_tree_add_uint(bofl_tree, hf_bofl_sequence, tvb, 4, 4, sequence); - - len = tvb_length_remaining(tvb, 8); - if (len > 0) - proto_tree_add_text(bofl_tree, tvb, 8, len, - "Padding (%d byte)", len); - } + + proto_tree_add_uint(bofl_tree, hf_bofl_sequence, tvb, 4, 4, sequence); + + len = tvb_length_remaining(tvb, 8); + if (len > 0) + proto_tree_add_text(bofl_tree, tvb, 8, len, + "Padding (%d byte)", len); } |