diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
| commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-nbns.c | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'epan/dissectors/packet-nbns.c')
| -rw-r--r-- | epan/dissectors/packet-nbns.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 4a07e21644..38976fe564 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1041,8 +1041,7 @@ dissect_nbns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nbns_data_offset = offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBNS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1210,8 +1209,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) name=ep_alloc(MAX_NAME_LEN); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBDS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBDS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1636,8 +1634,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *nbss_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBSS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBSS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); |