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-iec104.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-iec104.c')
| -rw-r--r-- | epan/dissectors/packet-iec104.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index d00e4f4b08..77fa6b1332 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -428,9 +428,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); asduh = ep_alloc(sizeof(struct asduheader)); res = ep_strbuf_new_label(NULL); @@ -521,9 +519,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - } + col_clear(pinfo->cinfo, COL_INFO); apcih = ep_alloc(sizeof(struct apciheader)); |