diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:59:51 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:59:51 +0000 |
| commit | 7a1740736d1aca5c3f0e07951327d24056237c5c (patch) | |
| tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-iec104.c | |
| parent | b2e9a22ec53becba2c23777ffee4ff375d135698 (diff) | |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29345 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 684398c8fc..d00e4f4b08 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -427,9 +427,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 */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } @@ -522,9 +520,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 */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } |