diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
| commit | 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch) | |
| tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-rtnet.c | |
| parent | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff) | |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-rtnet.c')
| -rw-r--r-- | epan/dissectors/packet-rtnet.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index a6661c1c7d..83bbc380b0 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -400,9 +400,7 @@ dissect_rtnet_tdma_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { msg = tvb_get_ntohl(tvb, offset); /* Set the protocol column */ - if (check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"TDMA-V1"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDMA-V1"); /* set the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -519,9 +517,7 @@ dissect_rtnet_tdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { msg = tvb_get_ntohs(tvb, 2); /* Set the protocol column */ - if (check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"TDMA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDMA"); /* Set the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -596,9 +592,7 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } /* Set the protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTmac"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTmac"); /* set the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -682,9 +676,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { const guint8 *haddr; /* Set the protocol column */ - if(check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"RTcfg"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTcfg"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)){ |