diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 08:14:59 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 08:14:59 +0000 |
commit | 6f85cafd57b8eb672cbf5682848bb5ee5cb78517 (patch) | |
tree | e77267cdd463c269c8fb7bbefda18517ed363cbb /epan/dissectors/packet-pppoe.c | |
parent | 7a1740736d1aca5c3f0e07951327d24056237c5c (diff) |
Don't guard col_clear with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29346 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-pppoe.c')
-rw-r--r-- | epan/dissectors/packet-pppoe.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index b161a80dcf..7792e3e7dc 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -426,10 +426,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Start Decoding Here. */ pppoe_code = tvb_get_guint8(tvb, 1); @@ -677,10 +674,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoES"); - if (check_col(pinfo->cinfo,COL_INFO)) - { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); /* Start Decoding Here. */ pppoe_code = tvb_get_guint8(tvb, 1); |