Don't col_clear() followed by col_set_str(). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)

svn path=/trunk/; revision=30086

29 files changed, 4 insertions, 90 deletions

diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 1e743dffc1..96f27e0787 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -71,8 +71,6 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Request");
 	}
 
@@ -97,8 +95,6 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Response");
 	}
 
diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c
index 58152bf2e9..6c99a11c57 100644
--- a/asn1/pkixcmp/packet-cmp-template.c
+++ b/asn1/pkixcmp/packet-cmp-template.c
@@ -125,8 +125,6 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-
 		col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 	}
 
@@ -296,7 +294,6 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 	}
 
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index 34d4a32e7d..01b5e74e05 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.c
@@ -67,8 +67,6 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Reply");
 	}
 
@@ -92,8 +90,6 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Query");
 	}
 
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index c450a636e7..5dbee96ca7 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -77,8 +77,6 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
 	}
 
diff --git a/epan/column-utils.c b/epan/column-utils.c
index b61d5de78d..f331e598b6 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -170,7 +170,7 @@ col_clear(column_info *cinfo, gint el)
        *      we don't do anything.
        */
       fence = cinfo->col_fence[i];
-      if (fence == 0 || cinfo->col_buf[i] == cinfo->col_data[i]) {
+      if (cinfo->col_buf[i] == cinfo->col_data[i] || fence == 0) {
         /*
          * The fence isn't at the end of the column, or the column wasn't
          * last set with "col_set_str()", so clear the column out.
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c
index 8885fc6ee0..bb4f0d1fdb 100644
--- a/epan/dissectors/packet-btamp.c
+++ b/epan/dissectors/packet-btamp.c
@@ -389,7 +389,6 @@ static void dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint16 cmd_length;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMP");
-    col_clear(pinfo->cinfo, COL_INFO);
     col_set_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
 
     if(tree){
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 004d1f7786..81ef42a43c 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -1020,7 +1020,6 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2CAP");
 	if(check_col(pinfo->cinfo, COL_INFO)){
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
 	}
 
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index 0d1d0efa65..fe8fdc5c90 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -625,7 +625,6 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RFCOMM");
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
 	}
 
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c
index 97dc80190f..90ad0556d7 100644
--- a/epan/dissectors/packet-cisco-wids.c
+++ b/epan/dissectors/packet-cisco-wids.c
@@ -80,8 +80,6 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	guint remain;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS");
-	col_clear(pinfo->cinfo, COL_INFO);
-
 	col_set_str(pinfo->cinfo, COL_INFO, "Cwids: ");
 	/* FIXME: col_set_fence(pinfo->cinfo, all-cols, only addr-cols?); */
 
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index b5d2cceda1..62031243bb 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1511,8 +1511,6 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-
 		col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 	}
 
@@ -1682,7 +1680,6 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 	}
 
diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index 1398e740a2..df17567400 100644
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -779,7 +779,6 @@ dissect_dlm3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLM3");
 
 
-  col_clear(pinfo->cinfo, COL_INFO);
   col_set_str(pinfo->cinfo, COL_INFO, "DLM3");
 
   if (check_col(pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c
index 778849c9c5..a0049cdf35 100644
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@@ -728,7 +728,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 	switch(mid) {
 	case HOMEPLUG_MID_LGDFV:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Firmware Version");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_gdfv, 1, FALSE);
@@ -740,7 +739,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LSF:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Start Firmware");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lsf, 1, FALSE);
@@ -748,7 +746,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LWM:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Write Memory");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lwm, 1, FALSE);
@@ -765,7 +762,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LRM:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Read Memory");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lrm, 1, FALSE);
@@ -781,7 +777,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LRNVM:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Read NVM");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lrnvm, 1, FALSE);
@@ -797,7 +792,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LWNVM:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Write NVM");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lwnvm, 1, FALSE);
@@ -813,7 +807,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LRESET:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Reset");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lreset, 1, FALSE);
@@ -821,7 +814,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_GMD:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Module Data");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_gmd, 1, FALSE);
@@ -839,7 +831,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_SMD:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Set Module Data");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_smd, 1, FALSE);
@@ -858,7 +849,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_CM:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Commit Module");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_cm, 1, FALSE);
@@ -869,7 +859,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LEMD:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase Module Data");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lemd, 1, FALSE);
@@ -880,7 +869,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_LENVMS:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase NVM Sectors");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_lenvms, 1, FALSE);
@@ -892,7 +880,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_GNVMP:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Get NVM Parametes");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_gnvmp, 1, FALSE);
@@ -907,7 +894,6 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 		break;
 	case HOMEPLUG_MID_SNVMP:
 		if (check_col(pinfo->cinfo, COL_INFO)) {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "Loader Set NVM Parametes");
 		}
 		ptvcursor_add(cursor, hf_homeplug_loader_snvmp, 1, FALSE);
@@ -947,70 +933,60 @@ static void dissect_homeplug_hreq(ptvcursor_t * cursor, packet_info * pinfo)
   switch(mid) {
   case HOMEPLUG_MID_GDV:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Device Version");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_gdv, 1, FALSE);
     break;
   case HOMEPLUG_MID_GFV:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Firmware Version");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_gfv, 1, FALSE);
     break;
   case HOMEPLUG_MID_GNEK:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Network Encryption Key Request");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_gnek, 1, FALSE);
     break;
   case HOMEPLUG_MID_GCLBPL:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/ Clear Local Bridge Proxy List");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_gclbpl, 1, FALSE);
     break;
   case HOMEPLUG_MID_NVDS:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Non-volatile Database Status");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_nvds, 1, FALSE);
     break;
   case HOMEPLUG_MID_GRBT:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Remote Bridge Table");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_grbt, 1, FALSE);
     break;
   case HOMEPLUG_MID_GSLNM:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Logical Network Mappings");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_gslnm, 1, FALSE);
     break;
   case HOMEPLUG_MID_GSSS:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Spectral Scaling");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_gsss, 1, FALSE);
     break;
   case HOMEPLUG_MID_RSL:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset to Secondary Loader");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_rsl, 1, FALSE);
     break;
   case HOMEPLUG_MID_RESET:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset");
     }
     ptvcursor_add(cursor, hf_homeplug_hreq_reset, 1, FALSE);
@@ -1043,7 +1019,6 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
   switch(mid) {
   case HOMEPLUG_MID_GDVR:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Device Version");
     }
     ptvcursor_add(cursor, hf_homeplug_hrsp_gdvr, 1, FALSE);
@@ -1051,7 +1026,6 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
     break;
   case HOMEPLUG_MID_GFVR:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Firmware Version");
     }
     ptvcursor_add(cursor, hf_homeplug_hrsp_gfvr, 1, FALSE);
@@ -1059,7 +1033,6 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
     break;
   case HOMEPLUG_MID_GNEKR:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Get Network Encryption Key");
     }
     ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr, 1, FALSE);
@@ -1068,7 +1041,6 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
     break;
   case HOMEPLUG_MID_INVALID:
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Invalid MME");
     }
     ptvcursor_add(cursor, hf_homeplug_hrsp_invalid, 1, FALSE);
@@ -1307,35 +1279,30 @@ static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo)
       break;
     case HOMEPLUG_MME_VS:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Vendor Specific");
       }
       dissect_homeplug_vs(cursor);
       break;
     case HOMEPLUG_MME_RBA:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Replace Bridge Address");
       }
       dissect_homeplug_rba(cursor);
       break;
     case HOMEPLUG_MME_SNK:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Set Network Encryption Key");
       }
       dissect_homeplug_snk(cursor);
       break;
     case HOMEPLUG_MME_MWR:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Multicast With Response");
       }
       dissect_homeplug_mwr(cursor);
       break;
     case HOMEPLUG_MME_CNK:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Confirm Network Encryption Key");
       }
       dissect_homeplug_cnk(cursor);
@@ -1351,28 +1318,24 @@ static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo)
       break;
     case HOMEPLUG_MME_LOADER:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Load Firmware");
       }
       dissect_homeplug_loader(cursor, pinfo);
       break;
     case HOMEPLUG_MME_HREQ:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Request");
       }
       dissect_homeplug_hreq(cursor, pinfo);
       break;
     case HOMEPLUG_MME_HRSP:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Response");
       }
       dissect_homeplug_hrsp(cursor, pinfo);
       break;
     case HOMEPLUG_MME_HTAG:
       if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Host Tag");
       }
       dissect_homeplug_htag(cursor);
@@ -1417,7 +1380,6 @@ dissect_homeplug(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "HomePlug");
   /* Clear out stuff in the info column */
   if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
     col_set_str(pinfo->cinfo, COL_INFO, "MAC Management");
   }
 
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index 0e85936115..035bd81b12 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -272,8 +272,7 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo,
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
-        col_set_str(pinfo->cinfo, COL_INFO,
+	col_set_str(pinfo->cinfo, COL_INFO,
                     "CNTL ");
     }
 
@@ -335,8 +334,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo,
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3");
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
-        col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
+	col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
     }
 
     if (tree) {
@@ -378,8 +376,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo,
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
     if (check_col(pinfo->cinfo, COL_INFO)) {
-	col_clear(pinfo->cinfo, COL_INFO);
-        col_set_str(pinfo->cinfo, COL_INFO,
+	col_set_str(pinfo->cinfo, COL_INFO,
                     "LWAPP IP or Layer 2");
     }
 
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index f107bb632c..56cdc72a29 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -990,7 +990,6 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		/* Call the IPv6 dissector */
 		dissector_try_port(ip_dissector_table, pproto, ipv6_tvb, pinfo, tree);
 
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement[Fast Binding Update]");
 	}
 }
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index a54d76ad81..c4dbb411f3 100644
--- 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");
     }
 
diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c
index f793e7b858..5b0f1508e7 100644
--- a/epan/dissectors/packet-nsrp.c
+++ b/epan/dissectors/packet-nsrp.c
@@ -160,7 +160,6 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     if (check_col(pinfo->cinfo, COL_INFO))
     {
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_set_str(pinfo->cinfo, COL_INFO, "NSRP Protocol");
 		}
 
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 37321ba184..0b795ff923 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -664,8 +664,6 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Request");
 	}
 
@@ -690,8 +688,6 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Response");
 	}
 
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index 0730277e67..69712815d3 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -132,7 +132,6 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	if (check_col(pinfo->cinfo, COL_INFO))
 	{
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "OICQ Protocol ");
 		
 	}
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 098a267161..868728881e 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -378,8 +378,6 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Reply");
 	}
 
@@ -403,8 +401,6 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Query");
 	}
 
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index 5ed845f3cc..9565482ee0 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -136,7 +136,6 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	if (check_col(pinfo->cinfo, COL_INFO))
 	{
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "SEBEK - ");
 
 		if (tvb->length<6)
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 323592c31a..cac8650ef5 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -910,8 +910,6 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		
 		col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
 	}
 
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index d4ce610e29..c67089d175 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -57,7 +57,6 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message: ");
     }
 
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index 38146a19ce..9e2166b0bd 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -267,7 +267,6 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_set_str(pinfo->cinfo, COL_INFO, "DCC-REQ Message: ");
     }
 
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index fdc65aa376..a0e40cde2b 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -113,7 +113,6 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_set_str(pinfo->cinfo, COL_INFO, "DCC-RSP Message: ");
     }
 
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index 4aa335ee9d..ad29064987 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -515,7 +515,6 @@ dissect_dcd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   if (check_col (pinfo->cinfo, COL_INFO))
     {
-      col_clear (pinfo->cinfo, COL_INFO);
       col_set_str(pinfo->cinfo, COL_INFO, "DCD Message: ");
     }
 
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c
index cb09705fac..1759d078d2 100644
--- a/plugins/docsis/packet-mdd.c
+++ b/plugins/docsis/packet-mdd.c
@@ -324,7 +324,6 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
 	if (check_col (pinfo->cinfo, COL_INFO))
 	{
-		col_clear (pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "MDD Message:");
     }
 
diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c
index ffd681232c..d801a0a563 100644
--- a/plugins/docsis/packet-regreqmp.c
+++ b/plugins/docsis/packet-regreqmp.c
@@ -57,7 +57,6 @@ dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
 	if (check_col (pinfo->cinfo, COL_INFO))
 		{
-		col_clear (pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "REG-REQ-MP Message:");
 		}
 
diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c
index 2bc6df62ca..5f63bc01f8 100644
--- a/plugins/docsis/packet-regrspmp.c
+++ b/plugins/docsis/packet-regrspmp.c
@@ -62,7 +62,6 @@ dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	
 	if (check_col (pinfo->cinfo, COL_INFO))
 		{
-		col_clear (pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:");
 		}
 	
diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c
index 48eeaf7399..f6c3f3f771 100644
--- a/plugins/docsis/packet-sync.c
+++ b/plugins/docsis/packet-sync.c
@@ -47,7 +47,6 @@ dissect_sync (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
 	if (check_col (pinfo->cinfo, COL_INFO))
 	{
-	col_clear (pinfo->cinfo, COL_INFO);
 	col_set_str(pinfo->cinfo, COL_INFO, "Sync Message:");
 	}