git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't col_clear() followed by col_set_str(). A col_set_str() will clear (replace...
[obnox/wireshark/wip.git]
/
epan
/
dissectors
/
packet-ncs.c
diff --git
a/epan/dissectors/packet-ncs.c
b/epan/dissectors/packet-ncs.c
index a54d76ad81289e82ef2d122ffc1415e0014fbdf8..c4dbb411f36b5a614e4b79c82254f048327d6d65 100644
(file)
--- a/
epan/dissectors/packet-ncs.c
+++ b/
epan/dissectors/packet-ncs.c
@@
-54,7
+54,6
@@
dissect_ncs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCS");
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_INFO, "Novell Cluster Services Heartbeat");
}