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-ncp-nmas.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-ncp-nmas.c')
| -rw-r--r-- | epan/dissectors/packet-ncp-nmas.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 812e719eec..cc51d32c93 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -299,9 +299,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc foffset += 1; /* Fill in the INFO column. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "C NMAS - %s", val_to_str(subfunc, nmas_func_enum, "Unknown (0x%02x)")); @@ -494,9 +492,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin subverb = request_value->req_nds_flags; msgverb = request_value->nds_request_verb; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); if (tvb_reported_length_remaining(tvb, foffset)<4) { return; } |