From 3f431f9dfbc5f5ee65c594efcf086bb863aa56bf Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Sat, 29 Dec 2007 00:55:01 +0000 Subject: [PATCH] Have a filled COL_INFO, even if tree is NULL svn path=/trunk/; revision=23966 --- epan/dissectors/packet-pcep.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 09a504e18c..f956885655 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -2304,12 +2304,10 @@ dissect_pcep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCEP"); /* Clear out stuff in the info column */ - if(check_col(pinfo->cinfo,COL_INFO)) + if (check_col(pinfo->cinfo,COL_INFO)) col_clear(pinfo->cinfo,COL_INFO); - if (tree) { - dissect_pcep_msg_tree(tvb, tree, ett_pcep, pinfo); - } + dissect_pcep_msg_tree(tvb, tree, ett_pcep, pinfo); } static void @@ -2319,7 +2317,7 @@ dissect_pcep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_pcep_pdu); } -/*Register le protocol with wireshark*/ +/*Register the protocol with wireshark*/ void proto_register_pcep(void){