diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-23 14:59:22 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-23 14:59:22 +0000 |
| commit | 90a5e748c2dc0a63e7d30cb2363175442469d9e0 (patch) | |
| tree | 0461cbd18a5106cb4eb36dd4447cec018ac99ebe /epan | |
| parent | 124faf721cb858fc6d251fcb6527f8c08979a022 (diff) | |
Don't col_clear(COL_PROTOCOL) followed by col_set_str(COL_PROTOCOL). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
svn path=/trunk/; revision=30090
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dec-dnart.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-icmpv6.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-iwarp-mpa.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-zep.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index ec99297f0e..f341424982 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -378,7 +378,6 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char *addr; offset = 0; - col_clear(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC DNA"); col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 5ad03663f6..a53ea2ba9c 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1637,7 +1637,6 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * 5.2.9. Direct IPv6 Connectivity Test */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_clear(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo"); } col_set_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test"); diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 01e37a22e1..70cceaa182 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -484,7 +484,6 @@ void mpa_packetlist(packet_info *pinfo, gint message_type) { if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_clear(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPA"); } diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index cf1d43ad54..07ba4b1d40 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -193,7 +193,6 @@ static void dissect_zep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Enter name info protocol field */ if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_clear(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, (zep_data.version==1)?"ZEP":"ZEPv2"); } |