From c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Wed, 13 Jan 2010 20:25:10 +0000
Subject: 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
---
 epan/dissectors/packet-2dparityfec.c    |   2 -
 epan/dissectors/packet-ansi_map.c       |   8 +-
 epan/dissectors/packet-bacnet.c         |   1 -
 epan/dissectors/packet-ber.c            |   8 +-
 epan/dissectors/packet-dplay.c          |  12 +-
 epan/dissectors/packet-enttec.c         |   1 -
 epan/dissectors/packet-ff.c             | 767 ++++++--------------------------
 epan/dissectors/packet-gift.c           |   3 -
 epan/dissectors/packet-hpteam.c         |   1 -
 epan/dissectors/packet-idp.c            |   2 -
 epan/dissectors/packet-ipmi-session.c   |   1 -
 epan/dissectors/packet-ipmi.c           |   5 +-
 epan/dissectors/packet-ismacryp.c       |  22 +-
 epan/dissectors/packet-iwarp-mpa.c      |   1 -
 epan/dissectors/packet-kingfisher.c     |   2 -
 epan/dissectors/packet-llt.c            |   1 -
 epan/dissectors/packet-msnlb.c          |   5 +-
 epan/dissectors/packet-pana.c           |   1 -
 epan/dissectors/packet-s5066.c          |   1 -
 epan/dissectors/packet-usb-masstorage.c |   3 +-
 epan/dissectors/packet-usb.c            |   6 +-
 epan/dissectors/packet-wol.c            |   1 -
 22 files changed, 154 insertions(+), 700 deletions(-)

(limited to 'epan')

diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index ddb57dd904..c200e3efe7 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -123,8 +123,6 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
    /* Configure the info column */
    if(check_col(pinfo->cinfo, COL_INFO))
    {
-      col_clear(pinfo->cinfo, COL_INFO);
-
       if(D)
       {
          col_add_fstr(pinfo->cinfo, COL_INFO, "Row FEC - SNBase=%u, Offset=%u, NA=%u",
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index e8d944a464..1202d9aa71 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -16285,7 +16285,6 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     case 1:
         OperationCode = p_private_tcap->d.OperationCode_private & 0x00ff;
         ansi_map_is_invoke = TRUE;
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_add_fstr(pinfo->cinfo, COL_INFO,"%s Invoke ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
         proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
         offset = dissect_invokeData(ansi_map_tree, tvb, 0, &asn1_ctx);
@@ -16293,17 +16292,14 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         break;
     case 2:
         OperationCode = find_saved_invokedata(&asn1_ctx);
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnResult ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
         proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
         offset = dissect_returnData(ansi_map_tree, tvb, 0, &asn1_ctx);
         break;
     case 3:
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnError ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
         break;
     case 4:
-	col_clear(pinfo->cinfo, COL_INFO);
 	col_add_fstr(pinfo->cinfo, COL_INFO,"%s Reject ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
         break;
     default:
@@ -19347,7 +19343,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.QualificationRequest2Res", HFILL }},
 
 /*--- End of included file: packet-ansi_map-hfarr.c ---*/
-#line 5287 "packet-ansi_map-template.c"
+#line 5283 "packet-ansi_map-template.c"
     };
 
     /* List of subtrees */
@@ -19608,7 +19604,7 @@ void proto_register_ansi_map(void) {
     &ett_ansi_map_ReturnData,
 
 /*--- End of included file: packet-ansi_map-ettarr.c ---*/
-#line 5320 "packet-ansi_map-template.c"
+#line 5316 "packet-ansi_map-template.c"
     };
 
 
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 13d7caefb8..8c16ddd214 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -349,7 +349,6 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		/* Put the NPDU Type in the info column */
 		if (check_col(pinfo->cinfo, COL_INFO))
 		{
-			col_clear(pinfo->cinfo, COL_INFO);
 			col_add_str(pinfo->cinfo, COL_INFO,
 				bacnet_mesgtyp_name(bacnet_mesgtyp));
 		}
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 8a6614f481..6c1b424c48 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4305,10 +4305,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if(!decode_as_syntax) {
  
     /* if we got here we couldn't find anything better */
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-      col_clear(pinfo->cinfo, COL_INFO);
-      col_append_str(pinfo->cinfo, COL_INFO, "Unknown BER");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Unknown BER");
 
     (void) dissect_unknown_ber(pinfo, tvb, 0, tree);
 
@@ -4321,8 +4318,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       /* see if we have a better name */
       name = get_ber_oid_syntax(decode_as_syntax);
 
-      col_clear(pinfo->cinfo, COL_INFO);
-      col_append_fstr(pinfo->cinfo, COL_INFO, "Decoded as %s", name ? name : decode_as_syntax);
+      col_add_fstr(pinfo->cinfo, COL_INFO, "Decoded as %s", name ? name : decode_as_syntax);
     }
   }
 }
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index 9472a850cd..4436abf461 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -1025,10 +1025,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if(memcmp(play_id, (guint8 *)&dplay_id, 4) != 0)
     {
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
-        /* Clear out stuff in the info column */
-        col_clear(pinfo->cinfo, COL_INFO);
-        if(check_col(pinfo->cinfo,COL_INFO))
-            col_set_str(pinfo->cinfo, COL_INFO, "DPlay data packet");
+        col_set_str(pinfo->cinfo,COL_INFO, "DPlay data packet");
         return;
     }
 
@@ -1038,8 +1035,6 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
-    /* Clear out stuff in the info column */
-    col_clear(pinfo->cinfo, COL_INFO);
 
     if(check_col(pinfo->cinfo,COL_INFO))
     {
@@ -1138,10 +1133,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr
     guint32 mixed, size, token;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
-    /* Clear out stuff in the info column */
-    col_clear(pinfo->cinfo, COL_INFO);
-    if(check_col(pinfo->cinfo,COL_INFO))
-        col_set_str(pinfo->cinfo, COL_INFO, "DPlay player to player message");
+    col_set_str(pinfo->cinfo,COL_INFO, "DPlay player to player message");
 
     if(tree)
     {
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 137dc956b7..15ba67bcff 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -355,7 +355,6 @@ dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	/* Clear out stuff in the info column */
 	if (check_col(pinfo->cinfo,COL_INFO)) {
-		col_clear(pinfo->cinfo,COL_INFO);
 		col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
 				val_to_str(head, enttec_head_vals, "Unknown (0x%08x)"));
 	}
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index b19bace4c1..8e5e654fee 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -1804,10 +1804,7 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FDA Open Session Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FDA Open Session Request");
 
 	if(!tree) {
 		return;
@@ -1881,10 +1878,7 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FDA Open Session Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FDA Open Session Response");
 
 	if(!tree) {
 		return;
@@ -1961,10 +1955,7 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FDA Open Session Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FDA Open Session Error");
 
 	if(!tree) {
 		return;
@@ -2023,10 +2014,7 @@ dissect_ff_msg_fda_idle_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FDA Idle Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FDA Idle Request");
 
 	if(!tree) {
 		return;
@@ -2060,10 +2048,7 @@ dissect_ff_msg_fda_idle_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FDA Idle Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FDA Idle Response");
 
 	if(!tree) {
 		return;
@@ -2100,10 +2085,7 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FDA Idle Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FDA Idle Error");
 
 	if(!tree) {
 		return;
@@ -2162,10 +2144,7 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Find Tag Query Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Find Tag Query Request");
 
 	if(!tree) {
 		return;
@@ -2311,10 +2290,7 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset,
 	guint8 DuplicateDetectionState	= 0;
 	guint16 NumOfFDAAddrSelectors	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Find Tag Reply Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Find Tag Reply Request");
 
 	if(!tree) {
 		return;
@@ -2419,10 +2395,7 @@ dissect_ff_msg_sm_id_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Identify Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Identify Request");
 
 	if(!tree) {
 		return;
@@ -2829,10 +2802,7 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset,
 
 	guint16 LinkId	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Identify Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Identify Response");
 
 	if(!tree) {
 		return;
@@ -2962,10 +2932,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Identify Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Identify Error");
 
 	if(!tree) {
 		return;
@@ -3023,10 +2990,7 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Clear Address Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Address Request");
 
 	if(!tree) {
 		return;
@@ -3079,10 +3043,7 @@ dissect_ff_msg_sm_clear_addr_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Clear Address Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Address Response");
 
 	if(!tree) {
 		return;
@@ -3119,10 +3080,7 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Clear Address Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Address Error");
 
 	if(!tree) {
 		return;
@@ -3289,11 +3247,7 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset,
 	guint8 DeviceRedundancyState	= 0;
 	guint8 ClearDuplicateDetectionState	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"SM Set Assignment Info Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO,"SM Set Assignment Info Request");
 
 	if(!tree) {
 		return;
@@ -3385,11 +3339,7 @@ dissect_ff_msg_sm_set_assign_info_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"SM Set Assignment Info Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Set Assignment Info Response");
 
 	if(!tree) {
 		return;
@@ -3442,10 +3392,7 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "SM Set Assignment Info Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Set Assignment Info Error");
 
 	if(!tree) {
 		return;
@@ -3505,11 +3452,7 @@ dissect_ff_msg_sm_clear_assign_info_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"SM Clear Assignment Info Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Assignment Info Request");
 
 	if(!tree) {
 		return;
@@ -3554,11 +3497,7 @@ dissect_ff_msg_sm_clear_assign_info_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"SM Clear Assignment Info Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO,"SM Clear Assignment Info Response");
 
 	if(!tree) {
 		return;
@@ -3596,11 +3535,7 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-		"SM Clear Assignment Info Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Assignment Info Error");
 
 	if(!tree) {
 		return;
@@ -4035,11 +3970,7 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset,
 
 	guint16 LinkId = 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"SM Device Annunciation Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "SM Device Annunciation Request");
 
 	if(!tree) {
 		return;
@@ -4169,11 +4100,7 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti			= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Request");
 
 	if(!tree) {
 		return;
@@ -4238,10 +4165,7 @@ dissect_ff_msg_fms_init_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti			= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Initiate Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Response");
 
 	if(!tree) {
 		return;
@@ -4288,10 +4212,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Initiate Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Error");
 
 	if(!tree) {
 		return;
@@ -4349,10 +4270,7 @@ dissect_ff_msg_fms_abort_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Abort Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Abort Request");
 
 	if(!tree) {
 		return;
@@ -4406,10 +4324,7 @@ dissect_ff_msg_fms_status_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Status Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Status Request");
 
 	if(!tree) {
 		return;
@@ -4443,10 +4358,7 @@ dissect_ff_msg_fms_status_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Status Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Status Response");
 
 	if(!tree) {
 		return;
@@ -4502,10 +4414,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Status Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Status Error");
 
 	if(!tree) {
 		return;
@@ -4563,11 +4472,7 @@ dissect_ff_msg_fms_unsolicited_status_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Unsolicited Status Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Unsolicited Status Request");
 
 	if(!tree) {
 		return;
@@ -4623,11 +4528,7 @@ dissect_ff_msg_fms_id_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Identify Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Identify Request");
 
 	if(!tree) {
 		return;
@@ -4661,10 +4562,7 @@ dissect_ff_msg_fms_id_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti			= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Identify Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Identify Response");
 
 	if(!tree) {
 		return;
@@ -4716,10 +4614,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Identify Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Identify Error");
 
 	if(!tree) {
 		return;
@@ -4777,10 +4672,7 @@ dissect_ff_msg_fms_get_od_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Get OD Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Get OD Request");
 
 	if(!tree) {
 		return;
@@ -4833,10 +4725,7 @@ dissect_ff_msg_fms_get_od_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Get OD Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Get OD Response");
 
 	if(!tree) {
 		return;
@@ -4887,10 +4776,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Get OD Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Get OD Error");
 
 	if(!tree) {
 		return;
@@ -4948,10 +4834,7 @@ dissect_ff_msg_fms_init_put_od_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Request");
 
 	if(!tree) {
 		return;
@@ -4995,10 +4878,7 @@ dissect_ff_msg_fms_init_put_od_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Response");
 
 	if(!tree) {
 		return;
@@ -5035,10 +4915,7 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Error");
 
 	if(!tree) {
 		return;
@@ -5097,10 +4974,7 @@ dissect_ff_msg_fms_put_od_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Put OD Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Put OD Request");
 
 	if(!tree) {
 		return;
@@ -5140,10 +5014,7 @@ dissect_ff_msg_fms_put_od_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Put OD Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Put OD Response");
 
 	if(!tree) {
 		return;
@@ -5180,10 +5051,7 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Put OD Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Put OD Error");
 
 	if(!tree) {
 		return;
@@ -5242,10 +5110,7 @@ dissect_ff_msg_fms_terminate_put_od_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Request");
 
 	if(!tree) {
 		return;
@@ -5279,11 +5144,7 @@ dissect_ff_msg_fms_terminate_put_od_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Put OD Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Response");
 
 	if(!tree) {
 		return;
@@ -5320,10 +5181,7 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Error");
 
 	if(!tree) {
 		return;
@@ -5391,11 +5249,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Initiate Download Sequence Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Initiate Download Sequence Request");
 
 	if(!tree) {
 		return;
@@ -5435,11 +5289,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Initiate Download Sequence Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Initiate Download Sequence Response");
 
 	if(!tree) {
 		return;
@@ -5478,11 +5328,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Initiate Download Sequence Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Initiate Download Sequence Error");
 
 	if(!tree) {
 		return;
@@ -5545,11 +5391,7 @@ dissect_ff_msg_fms_generic_download_segment_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Download Segment Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Download Segment Request");
 
 	if(!tree) {
 		return;
@@ -5598,11 +5440,7 @@ dissect_ff_msg_fms_generic_download_segment_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Download Segment Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Download Segment Response");
 
 	if(!tree) {
 		return;
@@ -5641,11 +5479,7 @@ dissect_ff_msg_fms_generic_download_segment_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Download Segment Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Download Segment Error");
 
 	if(!tree) {
 		return;
@@ -5708,11 +5542,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Terminate Download Sequence Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO,"FMS Generic Terminate Download Sequence Request");
 
 	if(!tree) {
 		return;
@@ -5753,11 +5583,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Terminate Download Sequence Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Terminate Download Sequence Response");
 
 	if(!tree) {
 		return;
@@ -5806,11 +5632,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Generic Terminate Download Sequence Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Terminate Download Sequence Error");
 
 	if(!tree) {
 		return;
@@ -5875,11 +5697,7 @@ dissect_ff_msg_fms_init_download_sequence_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Download Sequence Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Download Sequence Request");
 
 	if(!tree) {
 		return;
@@ -5920,11 +5738,7 @@ dissect_ff_msg_fms_init_download_sequence_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Download Sequence Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Download Sequence Response");
 
 	if(!tree) {
 		return;
@@ -5963,11 +5777,7 @@ dissect_ff_msg_fms_init_download_sequence_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Download Sequence Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Download Sequence Error");
 
 	if(!tree) {
 		return;
@@ -6028,10 +5838,7 @@ dissect_ff_msg_fms_download_segment_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Download Segment Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Download Segment Request");
 
 	if(!tree) {
 		return;
@@ -6070,11 +5877,7 @@ dissect_ff_msg_fms_download_segment_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Download Segment Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Download Segment Response");
 
 	if(!tree) {
 		return;
@@ -6120,11 +5923,7 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Download Segment Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Download Segment Error");
 
 	if(!tree) {
 		return;
@@ -6185,11 +5984,7 @@ dissect_ff_msg_fms_terminate_download_sequence_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Download Sequence Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Download Sequence Request");
 
 	if(!tree) {
 		return;
@@ -6240,11 +6035,7 @@ dissect_ff_msg_fms_terminate_download_sequence_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Download Sequence Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Download Sequence Response");
 
 	if(!tree) {
 		return;
@@ -6283,11 +6074,7 @@ dissect_ff_msg_fms_terminate_download_sequence_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Download Sequence Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Download Sequence Error");
 
 	if(!tree) {
 		return;
@@ -6351,11 +6138,7 @@ dissect_ff_msg_fms_init_upload_seq_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Upload Sequence Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Upload Sequence Request");
 
 	if(!tree) {
 		return;
@@ -6395,11 +6178,7 @@ dissect_ff_msg_fms_init_upload_seq_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Upload Sequence Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Upload Sequence Response");
 
 	if(!tree) {
 		return;
@@ -6437,11 +6216,7 @@ dissect_ff_msg_fms_init_upload_seq_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Initiate Upload Sequence Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Upload Sequence Error");
 
 	if(!tree) {
 		return;
@@ -6500,11 +6275,7 @@ dissect_ff_msg_fms_upload_segment_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Upload Segment Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Upload Segment Request");
 
 	if(!tree) {
 		return;
@@ -6543,10 +6314,7 @@ dissect_ff_msg_fms_upload_segment_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Upload Segment Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Upload Segment Response");
 
 	if(!tree) {
 		return;
@@ -6592,10 +6360,7 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Upload Segment Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Upload Segment Error");
 
 	if(!tree) {
 		return;
@@ -6656,11 +6421,7 @@ dissect_ff_msg_fms_terminate_upload_seq_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Upload Sequence Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Upload Sequence Request");
 
 	if(!tree) {
 		return;
@@ -6700,11 +6461,7 @@ dissect_ff_msg_fms_terminate_upload_seq_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Upload Sequence Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Upload Sequence Response");
 
 	if(!tree) {
 		return;
@@ -6743,11 +6500,7 @@ dissect_ff_msg_fms_terminate_upload_seq_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Terminate Upload Sequence Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Upload Sequence Error");
 
 	if(!tree) {
 		return;
@@ -6810,11 +6563,7 @@ dissect_ff_msg_fms_req_dom_download_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Request Domain Download Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO,"FMS Request Domain Download Request");
 
 	if(!tree) {
 		return;
@@ -6855,11 +6604,7 @@ dissect_ff_msg_fms_req_dom_download_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Request Domain Download Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO,"FMS Request Domain Download Response");
 
 	if(!tree) {
 		return;
@@ -6898,11 +6643,7 @@ dissect_ff_msg_fms_req_dom_download_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Request Domain Download Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Download Error");
 
 	if(!tree) {
 		return;
@@ -6964,11 +6705,7 @@ dissect_ff_msg_fms_req_dom_upload_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Request Domain Upload Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Upload Request");
 
 	if(!tree) {
 		return;
@@ -7009,11 +6746,7 @@ dissect_ff_msg_fms_req_dom_upload_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Request Domain Upload Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Upload Response");
 
 	if(!tree) {
 		return;
@@ -7052,11 +6785,7 @@ dissect_ff_msg_fms_req_dom_upload_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Request Domain Upload Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Upload Error");
 
 	if(!tree) {
 		return;
@@ -7150,11 +6879,7 @@ dissect_ff_msg_fms_create_pi_req(tvbuff_t *tvb, gint offset,
 	proto_item *ti	= NULL;
 	guint16 NumOfDomIdxes	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Create Program Invocation Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Create Program Invocation Request");
 
 	if(!tree) {
 		return;
@@ -7213,11 +6938,7 @@ dissect_ff_msg_fms_create_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Create Program Invocation Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Create Program Invocation Response");
 
 	if(!tree) {
 		return;
@@ -7260,11 +6981,7 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Create Program Invocation Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Create Program Invocation Error");
 
 	if(!tree) {
 		return;
@@ -7325,11 +7042,7 @@ dissect_ff_msg_fms_del_pi_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Delete Program Invocation Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO,"FMS Delete Program Invocation Request");
 
 	if(!tree) {
 		return;
@@ -7369,11 +7082,7 @@ dissect_ff_msg_fms_del_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Delete Program Invocation Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Program Invocation Response");
 
 	if(!tree) {
 		return;
@@ -7411,11 +7120,7 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Delete Program Invocation Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Program Invocation Error");
 
 	if(!tree) {
 		return;
@@ -7476,10 +7181,7 @@ dissect_ff_msg_fms_start_pi_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Start Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Start Request");
 
 	if(!tree) {
 		return;
@@ -7517,10 +7219,7 @@ dissect_ff_msg_fms_start_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Start Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Start Response");
 
 	if(!tree) {
 		return;
@@ -7557,10 +7256,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Start Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Start Error");
 
 	if(!tree) {
 		return;
@@ -7627,10 +7323,7 @@ dissect_ff_msg_fms_stop_pi_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Stop Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Stop Request");
 
 	if(!tree) {
 		return;
@@ -7668,10 +7361,7 @@ dissect_ff_msg_fms_stop_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Stop Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Stop Response");
 
 	if(!tree) {
 		return;
@@ -7708,10 +7398,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Stop Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Stop Error");
 
 	if(!tree) {
 		return;
@@ -7778,10 +7465,7 @@ dissect_ff_msg_fms_resume_pi_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Resume Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Resume Request");
 
 	if(!tree) {
 		return;
@@ -7819,10 +7503,7 @@ dissect_ff_msg_fms_resume_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Resume Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Resume Response");
 
 	if(!tree) {
 		return;
@@ -7859,10 +7540,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Resume Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Resume Error");
 
 	if(!tree) {
 		return;
@@ -7929,10 +7607,7 @@ dissect_ff_msg_fms_reset_pi_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Reset Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Reset Request");
 
 	if(!tree) {
 		return;
@@ -7970,10 +7645,7 @@ dissect_ff_msg_fms_reset_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Reset Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Reset Response");
 
 	if(!tree) {
 		return;
@@ -8010,10 +7682,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Reset Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Reset Error");
 
 	if(!tree) {
 		return;
@@ -8080,10 +7749,7 @@ dissect_ff_msg_fms_kill_pi_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Kill Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Kill Request");
 
 	if(!tree) {
 		return;
@@ -8121,10 +7787,7 @@ dissect_ff_msg_fms_kill_pi_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Kill Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Kill Response");
 
 	if(!tree) {
 		return;
@@ -8161,10 +7824,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Kill Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Kill Error");
 
 	if(!tree) {
 		return;
@@ -8222,11 +7882,7 @@ dissect_ff_msg_fms_read_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Read Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Read Request");
 
 	if(!tree) {
 		return;
@@ -8264,11 +7920,7 @@ dissect_ff_msg_fms_read_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Read Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Read Response");
 
 	if(!tree) {
 		return;
@@ -8302,10 +7954,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Read Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Read Error");
 
 	if(!tree) {
 		return;
@@ -8363,11 +8012,7 @@ dissect_ff_msg_fms_read_subindex_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Read with Subindex Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Read with Subindex Request");
 
 	if(!tree) {
 		return;
@@ -8411,11 +8056,7 @@ dissect_ff_msg_fms_read_subindex_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Read with Subindex Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Read with Subindex Response");
 
 	if(!tree) {
 		return;
@@ -8450,10 +8091,7 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Read with Subindex Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Read with Subindex Error");
 
 	if(!tree) {
 		return;
@@ -8514,10 +8152,7 @@ dissect_ff_msg_fms_write_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Write Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Write Request");
 
 	if(!tree) {
 		return;
@@ -8555,10 +8190,7 @@ dissect_ff_msg_fms_write_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Write Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Write Response");
 
 	if(!tree) {
 		return;
@@ -8595,10 +8227,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "FMS Write Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Write Error");
 
 	if(!tree) {
 		return;
@@ -8656,11 +8285,7 @@ dissect_ff_msg_fms_write_subindex_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Write with Subindex Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Write with Subindex Request");
 
 	if(!tree) {
 		return;
@@ -8704,11 +8329,7 @@ dissect_ff_msg_fms_write_subindex_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Write with Subindex Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Write with Subindex Response");
 
 	if(!tree) {
 		return;
@@ -8745,11 +8366,7 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Write with Subindex Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Write with Subindex Error");
 
 	if(!tree) {
 		return;
@@ -8843,11 +8460,7 @@ dissect_ff_msg_fms_def_variable_list_req(tvbuff_t *tvb, gint offset,
 	proto_item *ti	= NULL;
 	guint32 NumOfIndexes	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Define Variable List Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Define Variable List Request");
 
 	if(!tree) {
 		return;
@@ -8894,11 +8507,7 @@ dissect_ff_msg_fms_def_variable_list_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Define Variable List Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Define Variable List Response");
 
 	if(!tree) {
 		return;
@@ -8940,11 +8549,7 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Define Variable List Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Define Variable List Error");
 
 	if(!tree) {
 		return;
@@ -9005,11 +8610,7 @@ dissect_ff_msg_fms_del_variable_list_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Delete Variable List Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Variable List Request");
 
 	if(!tree) {
 		return;
@@ -9048,11 +8649,7 @@ dissect_ff_msg_fms_del_variable_list_rsp(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Delete Variable List Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Variable List Response");
 
 	if(!tree) {
 		return;
@@ -9089,11 +8686,7 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset,
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Delete Variable List Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Variable List Error");
 
 	if(!tree) {
 		return;
@@ -9154,11 +8747,7 @@ dissect_ff_msg_fms_info_report_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Information Report Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report Request");
 
 	if(!tree) {
 		return;
@@ -9199,11 +8788,7 @@ dissect_ff_msg_fms_info_report_subindex_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Information Report with Subindex Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report with Subindex Request");
 
 	if(!tree) {
 		return;
@@ -9249,11 +8834,7 @@ dissect_ff_msg_fms_info_report_change_req(tvbuff_t *tvb, gint offset,
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Information Report On Change Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report On Change Request");
 
 	if(!tree) {
 		return;
@@ -9295,11 +8876,7 @@ dissect_ff_msg_fms_info_report_change_subindex_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Information Report On Change with Subindex Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report On Change with Subindex Request");
 
 	if(!tree) {
 		return;
@@ -9348,11 +8925,7 @@ dissect_ff_msg_fms_ev_notification_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Event Notification Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Event Notification Request");
 
 	if(!tree) {
 		return;
@@ -9398,11 +8971,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Alter Event Condition Monitoring Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Alter Event Condition Monitoring Request");
 
 	if(!tree) {
 		return;
@@ -9453,11 +9022,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Alter Event Condition Monitoring Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Alter Event Condition Monitoring Response");
 
 	if(!tree) {
 		return;
@@ -9496,11 +9061,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Alter Event Condition Monitoring Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Alter Event Condition Monitoring Error");
 
 	if(!tree) {
 		return;
@@ -9565,11 +9126,7 @@ dissect_ff_msg_fms_ack_ev_notification_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Acknowledge Event Notification Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Acknowledge Event Notification Request");
 
 	if(!tree) {
 		return;
@@ -9614,11 +9171,7 @@ dissect_ff_msg_fms_ack_ev_notification_rsp(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Acknowledge Event Notification Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Acknowledge Event Notification Response");
 
 	if(!tree) {
 		return;
@@ -9657,11 +9210,7 @@ dissect_ff_msg_fms_ack_ev_notification_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"FMS Acknowledge Event Notification Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "FMS Acknowledge Event Notification Error");
 
 	if(!tree) {
 		return;
@@ -9724,11 +9273,7 @@ dissect_ff_msg_lr_get_info_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Get Information Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Information Request");
 
 	if(!tree) {
 		return;
@@ -9852,11 +9397,7 @@ dissect_ff_msg_lr_get_info_rsp(
 	guint8 MaxMsgNumDiff	= 0;
 	guint8 LRFlags	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Get Information Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Information Response");
 
 	if(!tree) {
 		return;
@@ -9962,11 +9503,7 @@ dissect_ff_msg_lr_get_info_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Get Information Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Information Error");
 
 	if(!tree) {
 		return;
@@ -10115,11 +9652,7 @@ dissect_ff_msg_lr_put_info_req(
 	guint8 MaxMsgNumDiff	= 0;
 	guint8 LRFlags	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Put Information Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Put Information Request");
 
 	if(!tree) {
 		return;
@@ -10310,11 +9843,7 @@ dissect_ff_msg_lr_put_info_rsp(
 	guint8 MaxMsgNumDiff	= 0;
 	guint8 LRFlags	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Put Information Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Put Information Response");
 
 	if(!tree) {
 		return;
@@ -10420,11 +9949,7 @@ dissect_ff_msg_lr_put_info_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Put Information Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Put Information Error");
 
 	if(!tree) {
 		return;
@@ -10485,11 +10010,7 @@ dissect_ff_msg_lr_get_statistics_req(
 	proto_tree *sub_tree	= NULL;
 	proto_item *ti	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Get Statistics Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Statistics Request");
 
 	if(!tree) {
 		return;
@@ -10558,11 +10079,7 @@ dissect_ff_msg_lr_get_statistics_rsp(
 	proto_item *ti	= NULL;
 	guint32 NumXcableStat;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Get Statistics Response");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Statistics Response");
 
 	if(!tree) {
 		return;
@@ -10649,11 +10166,7 @@ dissect_ff_msg_lr_get_statistics_err(
 	guint8 ErrorCode	= 0;
 	const char *error_code	= NULL;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-			"LAN Redundancy Get Statistics Error");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Statistics Error");
 
 	if(!tree) {
 		return;
@@ -10906,10 +10419,7 @@ dissect_ff_msg_diagnostic_msg_req(
 	guint8 DuplicateDetectionState	= 0;
 	guint16 NumOfInterfaceStatuses	= 0;
 
-	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_append_fstr(pinfo->cinfo, COL_INFO, "Diagnostic Message Request");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "Diagnostic Message Request");
 
 	if(!tree) {
 		return;
@@ -13079,8 +12589,7 @@ dissect_ff_msg_body(tvbuff_t *tvb, gint offset, guint32 length,
 
 		default:
 			if(check_col(pinfo->cinfo, COL_INFO)) {
-				col_clear(pinfo->cinfo, COL_INFO);
-				col_append_fstr(pinfo->cinfo, COL_INFO,
+				col_add_fstr(pinfo->cinfo, COL_INFO,
 				"Unknown Service (Protocol Id: %u, Confirmed Msg Type: %u) "
 				"(%s Service Id = %u)",
 				(ProtocolAndType & PROTOCOL_MASK) >> 2,
diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c
index f099fe8258..db87df8064 100644
--- a/epan/dissectors/packet-gift.c
+++ b/epan/dissectors/packet-gift.c
@@ -70,9 +70,6 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
 	line = tvb_get_ptr(tvb, offset, linelen);
 
-	/* clear the "Info" column */
-	col_clear(pinfo->cinfo, COL_INFO);
-
 	/* set "Info" column text */
 	if (check_col(pinfo->cinfo, COL_INFO)) 
 		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c
index db28645a23..1f2d19ab05 100644
--- a/epan/dissectors/packet-hpteam.c
+++ b/epan/dissectors/packet-hpteam.c
@@ -73,7 +73,6 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		strPtr = ether_to_str(mac_addr);
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP NIC Team");
 		/* Clear out stuff in the info column */
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_set_str(pinfo->cinfo, COL_INFO, "HP NIC Teaming Heartbeat; ");
 		col_append_fstr(pinfo->cinfo, COL_INFO, "Port MAC = %s ", strPtr);
 
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index ea60b66065..3bb2bd0d30 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -89,8 +89,6 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP");
 	col_clear(pinfo->cinfo, COL_INFO);
 
-	col_clear(pinfo->cinfo, COL_INFO);
-
 	if (tree) {
 		ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, FALSE);
 		idp_tree = proto_item_add_subtree(ti, ett_idp);
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index 2310e2f8bf..d2c0762f9e 100644
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -168,7 +168,6 @@ dissect_ipmi_session(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, "Session ID 0x%x", session_id);
 		if (authtype == IPMI_AUTH_RMCPP) {
 			col_append_fstr(pinfo->cinfo, COL_INFO, ", payload type: %s",
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 3118f0cfe5..2e7a8e09fd 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -1368,10 +1368,7 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	dfmt.flags = IPMI_D_BROADCAST | IPMI_D_TRG_SA;
 	ipmi_do_dissect(tvb, ipmi_tree, &dfmt);
 
-	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
-		col_add_str(pinfo->cinfo, COL_INFO, dfmt.info);
-	}
+	col_add_str(pinfo->cinfo, COL_INFO, dfmt.info);
 
 }
 
diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c
index f505e8dc64..47beed1bea 100644
--- a/epan/dissectors/packet-ismacryp.c
+++ b/epan/dissectors/packet-ismacryp.c
@@ -217,15 +217,10 @@ static gint ett_ismacryp_message = -1;
 static void dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	/* display ISMACryp version */
-	if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
-		col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_11);
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_11);
 
 	/* display RTP payload type */
-	if ( check_col( pinfo->cinfo, COL_INFO) ) {
-		col_clear(pinfo->cinfo,COL_INFO); /* clear column info */
-		
-		col_append_str(pinfo->cinfo, COL_INFO, "(PT=enc-mpeg4-generic)");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "(PT=enc-mpeg4-generic)");
 
 	dissect_ismacryp_common( tvb, pinfo, tree, V11);
 }
@@ -234,24 +229,17 @@ static void dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 static void dissect_ismacryp_v20(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	/* display ISMACryp version */
-	if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
-		col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_20);
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_20);
 
 	/* display RTP payload type */
-	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_clear(pinfo->cinfo,COL_INFO); /* clear column info */
-		col_append_str(pinfo->cinfo, COL_INFO, "(PT=enc-isoff-generic)");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "(PT=enc-isoff-generic)");
 
 	dissect_ismacryp_common( tvb, pinfo, tree, V20);
 }
 
 static void dissect_ismacryp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_clear(pinfo->cinfo,COL_INFO); /* clear column info */
-		col_append_str(pinfo->cinfo, COL_INFO, "Manual version");
-	}
+	col_set_str(pinfo->cinfo, COL_INFO, "Manual version");
 	dissect_ismacryp_common( tvb, pinfo, tree, version_type);   /* Unknown version type: Use preference */
 }
 
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c
index e3d6d09775..666c0f3e34 100644
--- a/epan/dissectors/packet-iwarp-mpa.c
+++ b/epan/dissectors/packet-iwarp-mpa.c
@@ -487,7 +487,6 @@ mpa_packetlist(packet_info *pinfo, gint message_type)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPA");
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_add_fstr(pinfo->cinfo, COL_INFO,
 				"%d > %d %s", pinfo->srcport, pinfo->destport,
 				val_to_str(message_type, mpa_messages,
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c
index 2910939bb3..83c4322e19 100644
--- a/epan/dissectors/packet-kingfisher.c
+++ b/epan/dissectors/packet-kingfisher.c
@@ -209,7 +209,6 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
         case 0x81:
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
             func_string = val_to_str(tvb_get_guint8(tvb, 0), function_code_vals, "Unknown function");
-            col_clear(pinfo->cinfo, COL_INFO);
             col_add_fstr(pinfo->cinfo, COL_INFO, "(%s)", func_string);
             proto_tree_add_protocol_format(tree, proto_kingfisher, tvb, 0, -1, "Kingfisher Protocol, %s", func_string);
             return TRUE;
@@ -272,7 +271,6 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
     func_string = val_to_str(kfp->function, function_code_vals, "Unknown function");
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
-    col_clear(pinfo->cinfo, COL_INFO);
     col_add_fstr(pinfo->cinfo, COL_INFO, "%u > %u (%s)", kfp->from, kfp->target, func_string);
 
 
diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c
index 74a9f62d01..0c7a2982c5 100644
--- a/epan/dissectors/packet-llt.c
+++ b/epan/dissectors/packet-llt.c
@@ -75,7 +75,6 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	message_type = tvb_get_guint8(tvb, 3);
 
 	if(check_col(pinfo->cinfo, COL_INFO)) {
-		col_clear(pinfo->cinfo, COL_INFO);
 		col_add_fstr(pinfo->cinfo, COL_INFO, "Message type: %s", val_to_str(message_type, message_type_vs, "Unknown (0x%02x)"));
 	}
 
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index 069ade2b52..ac1f6d65c6 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -57,10 +57,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS NLB");
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_clear(pinfo->cinfo, COL_INFO);
-    col_append_str(pinfo->cinfo, COL_INFO, "MS NLB heartbeat");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "MS NLB heartbeat");
 
   if (tree) {
     ti = proto_tree_add_item(tree, proto_msnlb, tvb, 0, -1, FALSE);
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index ba2f40f544..674246f921 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -536,7 +536,6 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PANA");
 
        if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_clear(pinfo->cinfo, COL_INFO);
                col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s-%s",
 			    val_to_str(msg_type, msg_type_names, "Unknown (%d)"),
 			    val_to_str(flags & PANA_FLAG_R, msg_subtype_names, "Unknown (%d)"));
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index 15aabf282d..3b07ce7cc6 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -1301,7 +1301,6 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066");
 	/* Clear out stuff in the info column, the add PDU type */
-	col_clear(pinfo->cinfo, COL_INFO);
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_add_fstr(pinfo->cinfo, COL_INFO, "PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
 	}
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 26c9cb108f..1fc01aa9c7 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -165,8 +165,7 @@ dissect_usb_ms_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS");
 
     if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_clear(pinfo->cinfo, COL_INFO);
-        col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+        col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
             val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x"),
             is_request?"Request":"Response");
     }
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 7b319ece41..290689049d 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -1861,8 +1861,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
                     offset += 1;
 
                     if (check_col(pinfo->cinfo, COL_INFO)) {
-                        col_clear(pinfo->cinfo, COL_INFO);
-                        col_append_fstr(pinfo->cinfo, COL_INFO, "%s Request",
+                        col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request",
                              val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x"));
                     }
 
@@ -1987,8 +1986,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
                      * dissector
                      */
                     if (check_col(pinfo->cinfo, COL_INFO)) {
-                        col_clear(pinfo->cinfo, COL_INFO);
-                        col_append_fstr(pinfo->cinfo, COL_INFO, "%s Response",
+                        col_add_fstr(pinfo->cinfo, COL_INFO, "%s Response",
                             val_to_str(usb_conv_info->usb_trans_info->request, setup_request_names_vals, "Unknown type %x"));
                     }
 
diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c
index 7cb140e5be..6875a993c7 100644
--- a/epan/dissectors/packet-wol.c
+++ b/epan/dissectors/packet-wol.c
@@ -186,7 +186,6 @@ dissect_wol(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, "MagicPacket for %s (%s)",
             get_ether_name(mac), ether_to_str(mac));
 
-- 
cgit v1.2.1