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 /plugins/giop | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'plugins/giop')
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 3 | ||||
| -rw-r--r-- | plugins/giop/packet-cosnaming.c | 3 | ||||
| -rw-r--r-- | plugins/giop/packet-parlay.c | 3 | ||||
| -rw-r--r-- | plugins/giop/packet-tango.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index a11454c801..882e907072 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -605,8 +605,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index daff120511..8df1757462 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -1552,8 +1552,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/giop/packet-parlay.c b/plugins/giop/packet-parlay.c index dad209aab9..a457eb13a6 100644 --- a/plugins/giop/packet-parlay.c +++ b/plugins/giop/packet-parlay.c @@ -101295,8 +101295,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PARLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PARLAY"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/giop/packet-tango.c b/plugins/giop/packet-tango.c index faebb7e073..54a8920a3f 100644 --- a/plugins/giop/packet-tango.c +++ b/plugins/giop/packet-tango.c @@ -4231,8 +4231,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TANGO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TANGO"); /* * Do not clear COL_INFO, as nothing is being written there by |