diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:47:24 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:47:24 +0000 |
| commit | a4ec6151729e7f8d37fca4b16909635b0fe11996 (patch) | |
| tree | e58e91c90ce6dea49642f282aa7058a79bcc84da /epan/dissectors/packet-cip.c | |
| parent | d9503878072210dc1b03da41b9c5ecaea8cb22f7 (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29341 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cip.c')
| -rw-r--r-- | epan/dissectors/packet-cip.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index bac17b322b..15e18a084b 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -1490,8 +1490,7 @@ typedef struct mr_mult_req_info { cip_req_info_t *mr_single_req_info; cip_req_info_t *cip_req_info; - if( check_col( pinfo->cinfo, COL_PROTOCOL ) ) - col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP MR" ); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP MR"); /* Add Service code & Request/Response tree */ rrsc_item = proto_tree_add_text( item_tree, tvb, offset, 1, "Service: " ); @@ -1849,8 +1848,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ } } - if( check_col( pinfo->cinfo, COL_PROTOCOL ) ) - col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP CM" ); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP CM"); /* Add Service code & Request/Response tree */ rrsc_item = proto_tree_add_text( item_tree, tvb, offset, 1, "Service: " ); @@ -2377,8 +2375,7 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item unsigned char add_stat_size; unsigned char i; - if( check_col( pinfo->cinfo, COL_PROTOCOL ) ) - col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP CCO" ); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP CCO"); /* Add Service code & Request/Response tree */ rrsc_item = proto_tree_add_text( item_tree, tvb, offset, 1, "Service: " ); @@ -2758,8 +2755,7 @@ dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cip_req_info_t *preq_info; /* Make entries in Protocol column and Info column on summary display */ - if( check_col( pinfo->cinfo, COL_PROTOCOL ) ) - col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP" ); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP"); if (check_col( pinfo->cinfo, COL_INFO ) ) col_clear( pinfo->cinfo, COL_INFO ); |