diff options
author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:56:28 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:56:28 +0000 |
commit | fa5b45834b3199bc3c47b3d328d54e0504d7b942 (patch) | |
tree | 721daa2acddb00e486c5c62923f7b6841b4c13eb /epan/dissectors/packet-pagp.c | |
parent | 0f0c111119811cf1c6c9353efdaaef302aca5930 (diff) |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-pagp.c')
-rw-r--r-- | epan/dissectors/packet-pagp.c | 64 |
1 files changed, 22 insertions, 42 deletions
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index a36c453e6e..e0b13a845a 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -192,49 +192,35 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(pagp_tree, hf_pagp_version_number, tvb, PAGP_VERSION_NUMBER, 1, raw_octet); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, - val_to_str_const(raw_octet, pdu_vers, "Unknown PDU version")); - } + col_append_str(pinfo->cinfo, COL_INFO, + val_to_str_const(raw_octet, pdu_vers, "Unknown PDU version")); if (raw_octet == PAGP_FLUSH_PDU) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", tvb_ether_to_str(tvb, PAGP_FLUSH_LOCAL_DEVICE_ID)); - } - if (tree) { - proto_tree_add_item(pagp_tree, hf_pagp_flush_local_device_id, tvb, - PAGP_FLUSH_LOCAL_DEVICE_ID, 6, ENC_NA); - } - - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", + + proto_tree_add_item(pagp_tree, hf_pagp_flush_local_device_id, tvb, + PAGP_FLUSH_LOCAL_DEVICE_ID, 6, ENC_NA); + + col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", tvb_ether_to_str(tvb, PAGP_FLUSH_PARTNER_DEVICE_ID)); - } - if (tree) { - proto_tree_add_item(pagp_tree, hf_pagp_flush_partner_device_id, tvb, - PAGP_FLUSH_PARTNER_DEVICE_ID, 6, ENC_NA); - } + + proto_tree_add_item(pagp_tree, hf_pagp_flush_partner_device_id, tvb, + PAGP_FLUSH_PARTNER_DEVICE_ID, 6, ENC_NA); raw_word = tvb_get_ntohl(tvb, PAGP_FLUSH_TRANSACTION_ID); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, - "; Transaction ID: 0x%x ", raw_word); - } - if (tree) { - proto_tree_add_uint(pagp_tree, hf_pagp_flush_transaction_id, tvb, - PAGP_FLUSH_TRANSACTION_ID, 4, raw_word); - } + col_append_fstr(pinfo->cinfo, COL_INFO, "; Transaction ID: 0x%x ", raw_word); + + proto_tree_add_uint(pagp_tree, hf_pagp_flush_transaction_id, tvb, + PAGP_FLUSH_TRANSACTION_ID, 4, raw_word); return; } /* Info PDU */ flags = tvb_get_guint8(tvb, PAGP_FLAGS); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, "; Flags 0x%x", flags); - } + col_append_fstr(pinfo->cinfo, COL_INFO, "; Flags 0x%x", flags); if (tree) { flags_item = proto_tree_add_uint(pagp_tree, hf_pagp_flags, tvb, @@ -263,14 +249,11 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", tvb_ether_to_str(tvb, PAGP_LOCAL_DEVICE_ID)); - } - if (tree) { - proto_tree_add_item(pagp_tree, hf_pagp_local_device_id, tvb, + + proto_tree_add_item(pagp_tree, hf_pagp_local_device_id, tvb, PAGP_LOCAL_DEVICE_ID, 6, ENC_NA); - } if (tree) { raw_octet = tvb_get_guint8(tvb, PAGP_LOCAL_LEARN_CAP); @@ -294,14 +277,11 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PAGP_LOCAL_GROUP_IFINDEX, 4, raw_word); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", tvb_ether_to_str(tvb, PAGP_PARTNER_DEVICE_ID)); - } - if (tree) { - proto_tree_add_item(pagp_tree, hf_pagp_partner_device_id, tvb, + + proto_tree_add_item(pagp_tree, hf_pagp_partner_device_id, tvb, PAGP_PARTNER_DEVICE_ID, 6, ENC_NA); - } if (tree) { raw_octet = tvb_get_guint8(tvb, PAGP_PARTNER_LEARN_CAP); |