From Didier Gautheron:

col_clear.diff 
Remove calls to col_clear :
- called twice.
- before functions which also clear the column
- by replacing col_clear + col_append_xxx with col_add_xxx
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394

svn path=/trunk/; revision=31517

9 files changed, 0 insertions, 9 deletions

diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index 96a3d29142..53ab538b7d 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -76,7 +76,6 @@ dissect_bpkmreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO, "BPKM Request (%s)",
 		    val_to_str (code, code_field_vals, "%s"));
     }
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index f3f702a129..bd39bf14f0 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -77,7 +77,6 @@ dissect_bpkmrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO, "BPKM Response (%s)",
 		    val_to_str (code, code_field_vals, "%s"));
     }
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index 098ee786ab..8ee2149ccd 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -58,7 +58,6 @@ dissect_dsaack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Dynamic Service Add Ack ID = %u (%s)", transid,
 		    val_to_str (response, docsis_conf_code, "%s"));
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index 02da937aba..49e81f89e7 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -58,7 +58,6 @@ dissect_dsarsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Dynamic Service Add Response ID = %u (%s)", transid,
 		    val_to_str (response, docsis_conf_code, "%s"));
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index 884ba4a991..51cdf80405 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -58,7 +58,6 @@ dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Dynamic Service Change Ack ID = %u (%s)", transid,
 		    val_to_str (response, docsis_conf_code, "%s"));
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index 5b6906620a..6e701a8e8d 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -59,7 +59,6 @@ dissect_dscrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Dynamic Service Change Response ID = %u (%s)", transid,
 		    val_to_str (response, docsis_conf_code, "%s"));
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index e0591ae372..0a989ea539 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -56,7 +56,6 @@ dissect_dsdrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Dynamic Service Delete Response Tran id = %u (%s)",
 		    tranid, val_to_str (confcode, docsis_conf_code, "%s"));
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index 62c4b68c2f..0b0f9da245 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -58,7 +58,6 @@ dissect_regack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Registration Acknowledge SID = %u (%s)", sid,
 		    val_to_str (response, docsis_conf_code, "%s"));
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index e647c79816..b98636293c 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -59,7 +59,6 @@ dissect_regrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Registration Response SID = %u (%s)", sid,
 		    val_to_str (response, docsis_conf_code, "%s"));