Fix some "format not a string literal and no format arguments" warnings.

svn path=/trunk/; revision=26652

15 files changed, 48 insertions, 49 deletions

diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 3da50e87fd..9c0eb9b9ce 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -4147,7 +4147,7 @@ showstack(statestack *pos, char *txt, int n)
 			p->node, stype, rep, chs, done, ref, pop, chr, rch, sch, con,
 			p->name, p->offset);
 	}
-	g_message(buf);
+	g_message("%s", buf);
 }
 
 #if 0
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index d77d3cfe25..3623838afc 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -620,11 +620,11 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
 
          CANopenNumberFormatter(&coe, szText, nMax);
          anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_number, tvb, offset, ETHERCAT_COE_HEADER_LEN, coe.v.Number);
-         proto_item_set_text(anItem, szText);
+         proto_item_set_text(anItem, "%s", szText);
 
          CANopenTypeFormatter(&coe, szText, nMax);
          anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_type, tvb, offset, ETHERCAT_COE_HEADER_LEN, coe.v.Type);
-         proto_item_set_text(anItem, szText);
+         proto_item_set_text(anItem, "%s", szText);
       }
 
       offset += ETHERCAT_COE_HEADER_LEN;
@@ -650,10 +650,10 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
 
             if( tree )
             {
-               proto_item_append_text(aparent, szText);
+               proto_item_append_text(aparent, "%s", szText);
 
                anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_sdoreq, tvb, offset, 1, sdo.anSdoHeaderUnion.Idq.Ccs);
-               proto_item_set_text(anItem, szText);
+               proto_item_set_text(anItem, "%s", szText);
                ecat_sdo_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_sdo);
 
                switch ( sdo.anSdoHeaderUnion.Idq.Ccs )
@@ -742,7 +742,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
             if( tree )
             {
                anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_sdores, tvb, offset, 1, sdo.anSdoHeaderUnion.Ids.Scs);
-               proto_item_set_text(anItem, szText);
+               proto_item_set_text(anItem, "%s", szText);
                ecat_sdo_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_sdo);
 
                switch ( sdo.anSdoHeaderUnion.Ids.Scs )
@@ -959,8 +959,8 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
          ETHERCAT_SOE_HEADER soe;
          init_soe_header(&soe, tvb, offset);
 
-         proto_item_append_text(aparent, szText);
-         proto_item_set_text(anItem, szText);
+         proto_item_append_text(aparent, "%s", szText);
+         proto_item_set_text(anItem, "%s", szText);
 
          ecat_soe_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_soe);
          anItem = proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_header, tvb, offset , 2, TRUE);
@@ -1065,26 +1065,26 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
 
          anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_type, tvb, offset, 4, eoe.anEoeHeaderInfoUnion.v.Type);
          EoETypeFormatter(&eoe, szText, nMax);
-         proto_item_set_text(anItem,szText);
+         proto_item_set_text(anItem, "%s", szText);
 
          switch ( eoe.anEoeHeaderInfoUnion.v.Type )
          {
          case EOE_TYPE_FRAME_FRAG:
             anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_fragno, tvb, offset, 4, eoe.anEoeHeaderDataUnion.v.Fragment);
             EoEFragNoFormatter(&eoe, szText, nMax);
-            proto_item_set_text(anItem,szText);
+            proto_item_set_text(anItem, "%s", szText);
 
             anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_offset, tvb, offset, 4, 32*eoe.anEoeHeaderDataUnion.v.OffsetBuffer);
             EoEOffsetFormatter(&eoe, szText, nMax);
-            proto_item_set_text(anItem,szText);
+            proto_item_set_text(anItem, "%s", szText);
 
             anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_frame, tvb, offset, 4, eoe.anEoeHeaderDataUnion.v.FrameNo);
             EoEFrameFormatter(&eoe, szText, nMax);
-            proto_item_set_text(anItem,szText);
+            proto_item_set_text(anItem, "%s", szText);
 
             anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_last, tvb, offset, 4, eoe.anEoeHeaderInfoUnion.v.LastFragment);
             EoELastFormatter(&eoe, szText, nMax);
-            proto_item_set_text(anItem,szText);
+            proto_item_set_text(anItem, "%s", szText);
 
             if ( eoe.anEoeHeaderInfoUnion.v.TimeStampRequested )
             {
@@ -1350,7 +1350,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
             /* Add type information to the mailbox header */
             MailboxTypeFormatter(&hdr, szText, nMax);
-            proto_tree_add_text(ecat_mailbox_header_tree, tvb, offset, 1, szText);
+            proto_tree_add_text(ecat_mailbox_header_tree, tvb, offset, 1, "%s", szText);
 
             /* Add counter information to the mailbox header */
             proto_tree_add_text(ecat_mailbox_header_tree, tvb, offset, 1, "Counter : %d",hdr.aControlUnion.v.Counter);
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index e402f0b658..839e99d211 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -541,7 +541,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
       {
          /* Create the sub tree for the current datagram */
          EcSubFormatter(tvb, suboffset, szText, nMax);
-         aitem = proto_tree_add_text(ecat_datagrams_tree, tvb, suboffset, subsize, szText);
+         aitem = proto_tree_add_text(ecat_datagrams_tree, tvb, suboffset, subsize, "%s", szText);
          ecat_datagram_tree = proto_item_add_subtree(aitem, ett_ecat_datagram_subtree);
 
          /* Create a subtree placeholder for the Header */
diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c
index 49c7663b36..aa44d28546 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/ethercat/packet-nv.c
@@ -134,7 +134,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
       ti= proto_tree_add_item(nv_header_tree, hf_nv_publisher, tvb, offset, sizeof(guint8)*6, TRUE);
       NvPublisherFormater(tvb, offset, szText, nMax);
-      proto_item_set_text(ti, szText);
+      proto_item_set_text(ti, "%s", szText);
       offset+=(sizeof(guint8)*6);
 
       ti= proto_tree_add_item(nv_header_tree, hf_nv_count, tvb, offset, sizeof(guint16), TRUE);
@@ -150,7 +150,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
          ti = proto_tree_add_item(nv_tree, hf_nv_variable, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len+var_length, TRUE);
          NvVarHeaderFormater(tvb, offset, szText, nMax);
-         proto_item_set_text(ti, szText);
+         proto_item_set_text(ti, "%s", szText);
 
          nv_var_tree = proto_item_add_subtree(ti, ett_nv_var);
          ti = proto_tree_add_item(nv_var_tree, hf_nv_varheader, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len, TRUE);
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index ee7ce66a3e..34490cb625 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -303,7 +303,7 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet
 
                     g_strlcat(buf, ")", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -318,7 +318,7 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet
 
                     g_strlcat(buf, ")", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index c80e419058..b981b0d8ba 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -828,8 +828,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
                         }
 
                         ti = proto_tree_add_item(tree, hf_iap_list_entry, tvb, offset, 2 + 1 + attr_len, FALSE);
-                        g_snprintf(buf, sizeof(buf) - 1, "%d", n + 1);
-                        proto_item_append_text(ti, buf);
+                        proto_item_append_text(ti, "%d", n + 1);
                         entry_tree = proto_item_add_subtree(ti, ett_iap_entry[n]);
 
                         proto_tree_add_item(entry_tree, hf_iap_obj_id, tvb, offset, 2, FALSE);
@@ -1325,7 +1324,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " bps)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1343,7 +1342,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " ms)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1365,7 +1364,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " bytes)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1389,7 +1388,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " frame window)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1415,7 +1414,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " additional BOFs at 115200)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1441,7 +1440,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " ms)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1467,7 +1466,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
 
                     g_strlcat(buf, " s)", 256);
 
-                    proto_item_append_text(ti, buf+2);
+                    proto_item_append_text(ti, "%s", buf+2);
 
                     break;
 
@@ -1620,7 +1619,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro
                 service_hints[0] = ' ';
                 service_hints[1] = '(';
 
-                proto_item_append_text(ti, service_hints);
+                proto_item_append_text(ti, "%s", service_hints);
             }
         }
         offset += hints_len;
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c
index 99a4776be5..9fc0155bb9 100644
--- a/plugins/m2m/packet-m2m.c
+++ b/plugins/m2m/packet-m2m.c
@@ -463,7 +463,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			/* get the TLV value offset */
 			tlv_offset = get_tlv_value_offset(&m2m_tlv_info);
 			/* display TLV type */
-			ti = proto_tree_add_protocol_format(m2m_tree, proto_m2m, tvb, offset, (tlv_len + tlv_offset), val_to_str(tlv_type, tlv_name, "Unknown TLV"));
+			ti = proto_tree_add_protocol_format(m2m_tree, proto_m2m, tvb, offset, (tlv_len + tlv_offset), "%s", val_to_str(tlv_type, tlv_name, "Unknown TLV"));
 			/* add TLV subtree */
 			tlv_tree = proto_item_add_subtree(ti, ett_m2m_tlv);
 			/* update the offset */
diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c
index 8caa3e9151..39a0eb71d1 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/mate/mate_util.c
@@ -63,7 +63,7 @@ void dbg_print(const gint* which, gint how, FILE* where, const gchar* fmt, ... )
 	va_end( list );
 
 	if (! where) {
-		g_message(debug_buffer);
+		g_message("%s", debug_buffer);
 	} else {
 		fputs(debug_buffer,where);
 		fputs("\n",where);
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index 6540c3be4e..4428128542 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -615,7 +615,7 @@ void parseVariant(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldN
 void parseArraySimple(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfIndex, fctSimpleTypeParser pParserFunction)
 {
     char szFieldName[] = "Array of Simple Type";
-    proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, szFieldName);
+    proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, "%s", szFieldName);
     proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_array);
     int i;
     gint32 iLen;
@@ -641,7 +641,7 @@ void parseArraySimple(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfInde
 void parseArrayEnum(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, fctEnumParser pParserFunction)
 {
     char szFieldName[] = "Array of Enum Type";
-    proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, szFieldName);
+    proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, "%s", szFieldName);
     proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_array);
     int i;
     gint32 iLen;
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index f9a7432829..5da7d49b33 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -352,7 +352,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		
 	/* update column info now */
     if (check_col(pinfo->cinfo, COL_INFO))
-      col_add_fstr(pinfo->cinfo, COL_INFO, szFieldSummary);
+      col_add_str(pinfo->cinfo, COL_INFO, szFieldSummary);
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 	    col_add_str(pinfo->cinfo, COL_PROTOCOL, pszProtShort);
 
diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c
index 856e8ab43c..8828ddca78 100644
--- a/plugins/profinet/packet-pn.c
+++ b/plugins/profinet/packet-pn.c
@@ -274,7 +274,7 @@ void
 pn_append_info(packet_info *pinfo, proto_item *dcp_item, const char *text)
 {
     if (check_col(pinfo->cinfo, COL_INFO))
-        col_append_fstr(pinfo->cinfo, COL_INFO, text);
+        col_append_str(pinfo->cinfo, COL_INFO, text);
 
     proto_item_append_text(dcp_item, "%s", text);
 }
diff --git a/plugins/sercosiii/packet-sercosiii_1v1_at.c b/plugins/sercosiii/packet-sercosiii_1v1_at.c
index 79830f5504..9be2363103 100644
--- a/plugins/sercosiii/packet-sercosiii_1v1_at.c
+++ b/plugins/sercosiii/packet-sercosiii_1v1_at.c
@@ -51,12 +51,12 @@ void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
   char devices[]="Recognized Devices"; /* fixme: it would be nice to have this as subtree */
   static char outbuf[200];
 
-  proto_tree_add_text(tree, tvb, 0, 1024, devices);
+  proto_tree_add_text(tree, tvb, 0, 1024, "%s", devices);
 
   /* check sequence count field */
   seqcnt = tvb_get_letohs(tvb, 0);
   g_snprintf(outbuf, sizeof(outbuf), "Number of Devices: %u", (0x1FF & seqcnt)-1);
-  proto_tree_add_text(tree, tvb, 0, 2, outbuf);
+  proto_tree_add_text(tree, tvb, 0, 2, "%s", outbuf);
 
   /* check SERCOS address of each topology field */
   for(i=1;i < MAX_SERCOS_DEVICES; ++i)
@@ -75,7 +75,7 @@ void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
     {
       g_snprintf(outbuf, sizeof(outbuf), "Device Address %u: %u", i, tfield);
     }
-    proto_tree_add_text(tree, tvb, i*2, 2, outbuf);
+    proto_tree_add_text(tree, tvb, i*2, 2, "%s", outbuf);
   }
 }
 
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index caf5599eff..4a9f53b8cc 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -2575,7 +2575,7 @@ set_ascii_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint msg_len){
    #define MAX_BUFFER 1024
    buffer=ep_alloc(MAX_BUFFER);
 
-   g_snprintf(buffer,MAX_BUFFER,label);
+   g_snprintf(buffer,MAX_BUFFER,"%s",label);
    buffer_index=strlen(label);
 
    while((buffer_index<MAX_BUFFER-2)&&(msg_index<msg_len)){
@@ -2597,7 +2597,7 @@ set_ascii_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint msg_len){
    }
    buffer[buffer_index]='\0';
 
-   proto_tree_add_text(msg_tree,tvb,offset,msg_len,buffer);
+   proto_tree_add_text(msg_tree,tvb,offset,msg_len,"%s",buffer);
 }
 
 static void
@@ -2609,7 +2609,7 @@ set_ascii_null_term_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint m
    #define MAX_BUFFER 1024
    buffer=ep_alloc(MAX_BUFFER);
 
-   g_snprintf(buffer,MAX_BUFFER,label);
+   g_snprintf(buffer,MAX_BUFFER,"%s",label);
    buffer_index=strlen(label);
 
    while((buffer_index<MAX_BUFFER-2)&&(msg_index<msg_len)){
@@ -2633,6 +2633,6 @@ set_ascii_null_term_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint m
    }
    buffer[buffer_index]='\0';
 
-   proto_tree_add_text(msg_tree,tvb,offset,msg_len,buffer);
+   proto_tree_add_text(msg_tree,tvb,offset,msg_len,"%s",buffer);
 }
 
diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c
index 8d4429564e..28cd0280e0 100644
--- a/plugins/v5ua/packet-v5ua.c
+++ b/plugins/v5ua/packet-v5ua.c
@@ -1517,7 +1517,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_
 
   switch(iua_version){
   case RFC:
-	  parameter_item   = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
+	  parameter_item   = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s",
 		val_to_str(tag, parameter_tag_values, "Unknown parameter"));
 	  parameter_tree   = proto_item_add_subtree(parameter_item, ett_v5ua_parameter);
 
@@ -1527,7 +1527,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_
 
   case DRAFT:
   default:
-	  parameter_item   = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
+	  parameter_item   = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s",
 		val_to_str(tag, parameter_tag_draft_values, "Unknown parameter"));
 	  parameter_tree   = proto_item_add_subtree(parameter_item, ett_v5ua_parameter);
 
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index 22387d5d57..3beeddadea 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -1468,18 +1468,18 @@ static void wimaxasncp_dissect_tlv_value(
         /* Add code and type to info column */
         if (check_col(pinfo->cinfo, COL_INFO))
         {
-            col_append_fstr(pinfo->cinfo, COL_INFO, " [");
-            col_append_fstr(pinfo->cinfo, COL_INFO,
+            col_append_str(pinfo->cinfo, COL_INFO, " [");
+            col_append_str(pinfo->cinfo, COL_INFO,
                             val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)"));
 
             if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE)
             {
-                col_append_fstr(pinfo->cinfo, COL_INFO, ", ");
-                col_append_fstr(pinfo->cinfo, COL_INFO,
+                col_append_str(pinfo->cinfo, COL_INFO, ", ");
+                col_append_str(pinfo->cinfo, COL_INFO,
                                 val_to_str(eap_type, eap_type_vals, "Unknown type (0x%02X)"));
             }
 
-            col_append_fstr(pinfo->cinfo, COL_INFO, "]");
+            col_append_str(pinfo->cinfo, COL_INFO, "]");
         }