From didier gautheron: remove redundant or use faster col_xxx functions

- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344


svn path=/trunk/; revision=52948

4 files changed, 11 insertions, 11 deletions

diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf
index 8d503f0398..4648800fac 100644
--- a/asn1/acse/acse.cnf
+++ b/asn1/acse/acse.cnf
@@ -91,17 +91,17 @@ PDV-list/presentation-data-values/octet-aligned		pDVList_octet_aligned
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree);
 
 #.FN_BODY AARQ-apdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request");
 
   %(DEFAULT_BODY)s
 
 #.FN_BODY AARE-apdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response");
 
   %(DEFAULT_BODY)s
 
 #.FN_BODY RLRQ-apdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "Release-Request");
 
   %(DEFAULT_BODY)s
 
@@ -117,7 +117,7 @@ PDV-list/presentation-data-values/octet-aligned		pDVList_octet_aligned
    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%%d)"));
 
 #.FN_BODY RLRE-apdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "Release-Response");
 
   %(DEFAULT_BODY)s
 
@@ -133,7 +133,7 @@ PDV-list/presentation-data-values/octet-aligned		pDVList_octet_aligned
    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_response_reason_vals, "reason(%%d)"));
 
 #.FN_BODY ABRT-apdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "Abort");
 
   %(DEFAULT_BODY)s
 
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf
index 0fe659dde8..0938047440 100644
--- a/asn1/gsm_map/gsm_map.cnf
+++ b/asn1/gsm_map/gsm_map.cnf
@@ -189,7 +189,7 @@ MAP-DialoguePDU				B "0.4.0.0.1.1.1.1" "map-DialogueAS"
 
 %(DEFAULT_BODY)s
   col_append_str(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode));
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
 
 #.FN_PARS  GSMMAPLocalErrorcode
 
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index bedf8ea9e1..0e64befb50 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -1871,8 +1871,8 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
   /* Get the length and add 2 */
   gsm_map_pdu_size = tvb_get_guint8(tvb, offset+1)+2;
 
-  col_add_str(actx->pinfo->cinfo, COL_INFO, val_to_str_const(gsmmap_pdu_type, gsm_old_Component_vals, "Unknown GSM-MAP Component"));
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ");
+  col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str_const(gsmmap_pdu_type, gsm_old_Component_vals, "Unknown GSM-MAP Component"));
+  col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
   offset = dissect_gsm_old_Component(FALSE, tvb, 0, actx, tree, hf_gsm_map_old_Component_PDU);
 /*
   offset = dissect_ber_choice(pinfo, tree, tvb, offset,
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index 4e470101a6..f37206ebd5 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -129,7 +129,7 @@ RTABapdu
 #.FN_BODY RTTPapdu  VAL_PTR=&priority
   int priority = -1;
 
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Turn-Please");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "Turn-Please");
 
   %(DEFAULT_BODY)s
 
@@ -137,7 +137,7 @@ RTABapdu
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%d)", priority);
 
 #.FN_BODY RTORJapdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Refuse");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "Refuse");
 
   %(DEFAULT_BODY)s
 
@@ -153,7 +153,7 @@ RTABapdu
    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, rtse_RefuseReason_vals, "reason(%%d)"));
 
 #.FN_BODY RTABapdu
-  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort");
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "Abort");
 
   %(DEFAULT_BODY)s