*_stdup_printf -> strdup for "single string only" formatting.

Done for performance improvements.

This could probably be done in checkAPIs.pl, but this was just
a quick manual check with grepping.

Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d
Reviewed-on: https://code.wireshark.org/review/15751
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

26 files changed, 62 insertions, 70 deletions

diff --git a/epan/dissectors/asn1/ldap/ldap.cnf b/epan/dissectors/asn1/ldap/ldap.cnf
index 452c6261f1..0e0861b4ce 100644
--- a/epan/dissectors/asn1/ldap/ldap.cnf
+++ b/epan/dissectors/asn1/ldap/ldap.cnf
@@ -572,7 +572,7 @@ ldap_conv_info_t *ldap_info;
 
 	if(and_filter_string) {
 		proto_item_append_text(it, "%%s", and_filter_string);
-		Filter_string=wmem_strdup_printf(wmem_packet_scope(), "%%s",and_filter_string);
+		Filter_string=wmem_strdup(wmem_packet_scope(), and_filter_string);
 	}
 	and_filter_string=old_and_filter_string;
 
@@ -596,7 +596,7 @@ ldap_conv_info_t *ldap_info;
 %(DEFAULT_BODY)s
 	if(or_filter_string) {
 		proto_item_append_text(it, "%%s", or_filter_string);
-		Filter_string=wmem_strdup_printf(wmem_packet_scope(), "%%s",or_filter_string);
+		Filter_string=wmem_strdup(wmem_packet_scope(), or_filter_string);
 	}
 	or_filter_string=old_or_filter_string;
 
diff --git a/epan/dissectors/asn1/ros/ros-err.cnf b/epan/dissectors/asn1/ros/ros-err.cnf
index 76aa331dcb..e9e9bce243 100644
--- a/epan/dissectors/asn1/ros/ros-err.cnf
+++ b/epan/dissectors/asn1/ros/ros-err.cnf
@@ -25,7 +25,7 @@
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "ERR:");
+    descr = wmem_strdup(wmem_packet_scope(), "ERR:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
diff --git a/epan/dissectors/asn1/ros/ros-inv.cnf b/epan/dissectors/asn1/ros/ros-inv.cnf
index 1bc9251c49..acbcaff2d2 100644
--- a/epan/dissectors/asn1/ros/ros-inv.cnf
+++ b/epan/dissectors/asn1/ros/ros-inv.cnf
@@ -25,7 +25,7 @@
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "INV:");
+    descr = wmem_strdup(wmem_packet_scope(), "INV:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
diff --git a/epan/dissectors/asn1/ros/ros-res.cnf b/epan/dissectors/asn1/ros/ros-res.cnf
index f0900906cb..69b09f82a6 100644
--- a/epan/dissectors/asn1/ros/ros-res.cnf
+++ b/epan/dissectors/asn1/ros/ros-res.cnf
@@ -26,7 +26,7 @@
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "RES:");
+    descr = wmem_strdup(wmem_packet_scope(), "RES:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c
index 51c7c67a25..098b076662 100644
--- a/epan/dissectors/file-pcapng.c
+++ b/epan/dissectors/file-pcapng.c
@@ -680,8 +680,7 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo,
                 set_address_tvb(&addr, AT_IPv4, 4, tvb, offset);
                 offset += 4;
 
-                str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-                        address_to_display(wmem_packet_scope(),  &addr));
+                str = address_to_display(wmem_packet_scope(), &addr);
 
                 break;
             case 0x0004:
@@ -695,8 +694,7 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo,
                 set_address_tvb(&addr, AT_IPv6, 16, tvb, offset);
                 offset += 16;
 
-                str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-                        address_to_display(wmem_packet_scope(),  &addr));
+                str = address_to_display(wmem_packet_scope(),  &addr);
 
                 break;
             default:
@@ -1142,8 +1140,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
                     }
                 }
 
-                str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-                        address_to_display(wmem_packet_scope(),  &addr));
+                str = address_to_display(wmem_packet_scope(), &addr);
                 break;
             case 0x0002: /* IPv6 Record */
                 if (record_length < 17) {
@@ -1168,8 +1165,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
                     }
                 }
 
-                str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-                        address_to_display(wmem_packet_scope(),  &addr));
+                str = address_to_display(wmem_packet_scope(), &addr);
 
                 break;
             default:
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 3327f8c9a9..8365817769 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -958,8 +958,8 @@ SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset,
 	/* GetPrinterDataEx() stores the key/value in se_data */
 	if(!pinfo->fd->flags.visited){
 		if(!dcv->se_data){
-			dcv->se_data = wmem_strdup_printf(wmem_file_scope(),
-				"%s", value_name?value_name:"");
+			dcv->se_data = wmem_strdup(wmem_file_scope(),
+				value_name?value_name:"");
 		}
 	}
 
@@ -2448,8 +2448,8 @@ SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
 	/* OpenPrinterEx() stores the key/value in se_data */
 	if(!pinfo->fd->flags.visited){
 		if(!dcv->se_data){
-			dcv->se_data = wmem_strdup_printf(wmem_file_scope(),
-				"%s", name?name:"");
+			dcv->se_data = wmem_strdup(wmem_file_scope(),
+				name?name:"");
 		}
 	}
 
diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c
index b79af89aa9..8e6dd66b41 100644
--- a/epan/dissectors/packet-devicenet.c
+++ b/epan/dissectors/packet-devicenet.c
@@ -133,7 +133,7 @@ static gboolean uat_devicenet_record_update_cb(void* r, char** err) {
     uat_devicenet_record_t* rec = (uat_devicenet_record_t *)r;
 
     if (rec->mac_id > 63) {
-        *err = g_strdup_printf("MAC ID must be between 0-63");
+        *err = g_strdup("MAC ID must be between 0-63");
         return FALSE;
     }
     return TRUE;
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index e5a53232c7..d65a4ffa70 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -315,8 +315,7 @@ dissect_diameter_3gpp_imeisv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 
         item = proto_tree_add_item(tree, hf_diameter_3gpp_imeisv, tvb, offset, length, ENC_UTF_8 | ENC_NA);
         PROTO_ITEM_SET_GENERATED(item);
-        diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-            tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA));
+        diam_sub_dis->avp_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA);
     }
 
     return length;
@@ -390,8 +389,7 @@ dissect_diameter_3gpp_af_application_identifier(tvbuff_t *tvb, packet_info *pinf
 
         item = proto_tree_add_item(tree, hf_diameter_3gpp_af_application_identifier, tvb, offset, length, ENC_UTF_8 | ENC_NA);
         PROTO_ITEM_SET_GENERATED(item);
-        diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-            tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA));
+        diam_sub_dis->avp_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA);
     }
 
     return length;
@@ -416,8 +414,7 @@ dissect_diameter_3gpp_af_charging_identifier(tvbuff_t *tvb, packet_info *pinfo _
 
         item = proto_tree_add_item(tree, hf_diameter_3gpp_af_charging_identifier, tvb, offset, length, ENC_UTF_8 | ENC_NA);
         PROTO_ITEM_SET_GENERATED(item);
-        diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-            tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA));
+        diam_sub_dis->avp_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA);
     }
 
     return length;
@@ -1012,8 +1009,7 @@ dissect_diameter_3gpp_charging_rule_name(tvbuff_t *tvb, packet_info *pinfo _U_,
 
         item = proto_tree_add_item(tree, hf_diameter_3gpp_charging_rule_name, tvb, offset, length, ENC_UTF_8 | ENC_NA);
         PROTO_ITEM_SET_GENERATED(item);
-        diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "%s",
-            tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA));
+        diam_sub_dis->avp_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_UTF_8 | ENC_NA);
     }
 
     return length;
diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c
index 0bb31b2fa8..e3d1fcef8b 100644
--- a/epan/dissectors/packet-dof.c
+++ b/epan/dissectors/packet-dof.c
@@ -3365,30 +3365,30 @@ static void secmode_list_update_cb(void *r, const char **err)
     size = (guint32)strlen(rec->domain);
     if (!VALIDHEX(rec->domain[0]) && !dof_oid_create_internal(rec->domain, &size, NULL))
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid domain [must be valid OID].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid domain [must be valid OID].");
         return;
     }
     else if (!count_hex_bytes(rec->domain))
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid domain [must be valid OID].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid domain [must be valid OID].");
         return;
     }
 
     size = (guint32)strlen(rec->identity);
     if (!VALIDHEX(rec->identity[0]) && !dof_oid_create_internal(rec->identity, &size, NULL))
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid identity [must be valid OID].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid identity [must be valid OID].");
         return;
     }
     else if (!count_hex_bytes(rec->identity))
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid identity [must be valid OID].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid identity [must be valid OID].");
         return;
     }
 
     if (count_hex_bytes(rec->kek) != 32)
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid KEK [must be 32 byte key].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid KEK [must be 32 byte key].");
         return;
     }
 }
@@ -3455,7 +3455,7 @@ static void seckey_list_update_cb(void *r, const char **err)
     *err = NULL;
     if (count_hex_bytes(rec->key) != 32)
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid secret [must be 32 bytes].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid secret [must be 32 bytes].");
         return;
     }
 }
@@ -3507,13 +3507,13 @@ static void identsecret_list_update_cb(void *r, const char **err)
     {
         if (dof_oid_create_internal(rec->domain, &size, NULL))
         {
-            *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid domain [must be valid OID].");
+            *err = wmem_strdup(wmem_packet_scope(), "Invalid domain [must be valid OID].");
             return;
         }
     }
     else if (!count_hex_bytes(rec->domain))
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid domain [must be valid OID].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid domain [must be valid OID].");
         return;
     }
 
@@ -3522,19 +3522,19 @@ static void identsecret_list_update_cb(void *r, const char **err)
     {
         if (dof_oid_create_internal(rec->identity, &size, NULL))
         {
-            *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid identity [must be valid OID].");
+            *err = wmem_strdup(wmem_packet_scope(), "Invalid identity [must be valid OID].");
             return;
         }
     }
     else if (!count_hex_bytes(rec->identity))
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid identity [must be valid OID].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid identity [must be valid OID].");
         return;
     }
 
     if (count_hex_bytes(rec->secret) != 32)
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "Invalid secret [must be 32 byte key].");
+        *err = wmem_strdup(wmem_packet_scope(), "Invalid secret [must be 32 byte key].");
         return;
     }
 }
@@ -3719,7 +3719,7 @@ static gboolean identsecret_chk_cb(void *r _U_, const char *p _U_, unsigned len
 
     if (!num_protos)
     {
-        *err = wmem_strdup_printf(wmem_packet_scope(), "No protocols given");
+        *err = wmem_strdup(wmem_packet_scope(), "No protocols given");
         return FALSE;
     }
 
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 1302c03e1e..dcb5fbd76e 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1556,7 +1556,7 @@ static gboolean
 dtlsdecrypt_uat_fld_protocol_chk_cb(void* r _U_, const char* p, guint len _U_, const void* u1 _U_, const void* u2 _U_, char** err)
 {
     if (!p || strlen(p) == 0u) {
-        *err = g_strdup_printf("No protocol given.");
+        *err = g_strdup("No protocol given.");
         return FALSE;
     }
 
diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c
index 1ff1f3be86..c17dbacb55 100644
--- a/epan/dissectors/packet-h450-ros.c
+++ b/epan/dissectors/packet-h450-ros.c
@@ -235,7 +235,7 @@ dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "INV:");
+    descr = wmem_strdup(wmem_packet_scope(), "INV:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -318,7 +318,7 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "RES:");
+    descr = wmem_strdup(wmem_packet_scope(), "RES:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -388,7 +388,7 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "ERR:");
+    descr = wmem_strdup(wmem_packet_scope(), "ERR:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index d3a0213b45..a0e278e5d9 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -5309,7 +5309,7 @@ static gboolean ikev1_uat_data_update_cb(void* p, char** err) {
   }
 
   if (ud->key_len == 0) {
-    *err = g_strdup_printf("Must have Encryption key.");
+    *err = g_strdup("Must have Encryption key.");
     return FALSE;
   }
 
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 1b9fdf8025..154cef36bd 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -375,7 +375,7 @@ protos_chk_cb(void* r _U_, const char* p, guint len, const void* u1 _U_, const v
 		g_strstrip(protos[num_protos]);
 
 	if (!num_protos) {
-		*err = g_strdup_printf("No protocols given");
+		*err = g_strdup("No protocols given");
 		wmem_free(NULL, line);
 		wmem_free(NULL, protos);
 		return FALSE;
diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c
index e7101ef711..006b067abd 100644
--- a/epan/dissectors/packet-lbmpdmtcp.c
+++ b/epan/dissectors/packet-lbmpdmtcp.c
@@ -159,7 +159,7 @@ static gboolean lbmpdm_tcp_tag_update_cb(void * record, char * * error_string)
 
     if (tag->name == NULL)
     {
-        *error_string = g_strdup_printf("Tag name can't be empty");
+        *error_string = g_strdup("Tag name can't be empty");
         return FALSE;
     }
     else
@@ -167,7 +167,7 @@ static gboolean lbmpdm_tcp_tag_update_cb(void * record, char * * error_string)
         g_strstrip(tag->name);
         if (tag->name[0] == 0)
         {
-            *error_string = g_strdup_printf("Tag name can't be empty");
+            *error_string = g_strdup("Tag name can't be empty");
             return FALSE;
         }
     }
diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c
index e42d0bb43e..f112f7e2b6 100644
--- a/epan/dissectors/packet-lbmr.c
+++ b/epan/dissectors/packet-lbmr.c
@@ -1967,7 +1967,7 @@ static gboolean lbmr_tag_update_cb(void * record, char * * error_string)
 
     if (tag->name == NULL)
     {
-        *error_string = g_strdup_printf("Tag name can't be empty");
+        *error_string = g_strdup("Tag name can't be empty");
         return FALSE;
     }
     else
@@ -1975,7 +1975,7 @@ static gboolean lbmr_tag_update_cb(void * record, char * * error_string)
         g_strstrip(tag->name);
         if (tag->name[0] == 0)
         {
-            *error_string = g_strdup_printf("Tag name can't be empty");
+            *error_string = g_strdup("Tag name can't be empty");
             return FALSE;
         }
     }
diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c
index f3e1e6842d..16bbbf64e8 100644
--- a/epan/dissectors/packet-lbtrm.c
+++ b/epan/dissectors/packet-lbtrm.c
@@ -652,7 +652,7 @@ static gboolean lbtrm_tag_update_cb(void * record, char * * error_string)
 
     if (tag->name == NULL)
     {
-        *error_string = g_strdup_printf("Tag name can't be empty");
+        *error_string = g_strdup("Tag name can't be empty");
         return FALSE;
     }
     else
@@ -660,7 +660,7 @@ static gboolean lbtrm_tag_update_cb(void * record, char * * error_string)
         g_strstrip(tag->name);
         if (tag->name[0] == 0)
         {
-            *error_string = g_strdup_printf("Tag name can't be empty");
+            *error_string = g_strdup("Tag name can't be empty");
             return FALSE;
         }
     }
diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c
index 8b79178a43..91fc8bea82 100644
--- a/epan/dissectors/packet-lbtru.c
+++ b/epan/dissectors/packet-lbtru.c
@@ -701,7 +701,7 @@ static gboolean lbtru_tag_update_cb(void * record, char * * error_string)
 
     if (tag->name == NULL)
     {
-        *error_string = g_strdup_printf("Tag name can't be empty");
+        *error_string = g_strdup("Tag name can't be empty");
         return FALSE;
     }
     else
@@ -709,7 +709,7 @@ static gboolean lbtru_tag_update_cb(void * record, char * * error_string)
         g_strstrip(tag->name);
         if (tag->name[0] == 0)
         {
-            *error_string = g_strdup_printf("Tag name can't be empty");
+            *error_string = g_strdup("Tag name can't be empty");
             return FALSE;
         }
     }
diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c
index 615b760255..d91f19e85d 100644
--- a/epan/dissectors/packet-lbttcp.c
+++ b/epan/dissectors/packet-lbttcp.c
@@ -332,7 +332,7 @@ static gboolean lbttcp_tag_update_cb(void * record, char * * error_string)
 
     if (tag->name == NULL)
     {
-        *error_string = g_strdup_printf("Tag name can't be empty");
+        *error_string = g_strdup("Tag name can't be empty");
         return FALSE;
     }
     else
@@ -340,7 +340,7 @@ static gboolean lbttcp_tag_update_cb(void * record, char * * error_string)
         g_strstrip(tag->name);
         if (tag->name[0] == 0)
         {
-            *error_string = g_strdup_printf("Tag name can't be empty");
+            *error_string = g_strdup("Tag name can't be empty");
             return FALSE;
         }
     }
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 95ba5258bf..fae5f52787 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -1900,7 +1900,7 @@ dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 	if(and_filter_string) {
 		proto_item_append_text(it, "%s", and_filter_string);
-		Filter_string=wmem_strdup_printf(wmem_packet_scope(), "%s",and_filter_string);
+		Filter_string=wmem_strdup(wmem_packet_scope(), and_filter_string);
 	}
 	and_filter_string=old_and_filter_string;
 
@@ -1948,7 +1948,7 @@ dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 	if(or_filter_string) {
 		proto_item_append_text(it, "%s", or_filter_string);
-		Filter_string=wmem_strdup_printf(wmem_packet_scope(), "%s",or_filter_string);
+		Filter_string=wmem_strdup(wmem_packet_scope(), or_filter_string);
 	}
 	or_filter_string=old_or_filter_string;
 
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index 6f975104ea..d2fc2a2d92 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -296,7 +296,7 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "INV:");
+    descr = wmem_strdup(wmem_packet_scope(), "INV:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -389,7 +389,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "RES:");
+    descr = wmem_strdup(wmem_packet_scope(), "RES:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -469,7 +469,7 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
     else if (actx->rose_ctx->d.code == 1)
       descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = wmem_strdup_printf(wmem_packet_scope(), "ERR:");
+    descr = wmem_strdup(wmem_packet_scope(), "ERR:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index b7c4b2193a..5dc7168844 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -435,7 +435,7 @@ rpcstat_param(register_srt_t* srt, const char* opt_arg, char** err)
 	}
 	else
 	{
-		*err = g_strdup_printf("<program>,<version>[,<filter>]");
+		*err = g_strdup("<program>,<version>[,<filter>]");
 	}
 
 	return pos;
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 3851c5da93..7b5a526db4 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -1062,7 +1062,7 @@ scsistat_param(register_srt_t* srt, const char* opt_arg, char** err)
     }
     else
     {
-        *err = g_strdup_printf("<cmdset>[,<filter>]");
+        *err = g_strdup("<cmdset>[,<filter>]");
     }
 
     return pos;
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 2ed8f89a60..4f7b000fe2 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -4916,7 +4916,7 @@ gboolean
 ssldecrypt_uat_fld_ip_chk_cb(void* r _U_, const char* p, guint len _U_, const void* u1 _U_, const void* u2 _U_, char** err)
 {
     if (!p || strlen(p) == 0u) {
-        *err = g_strdup_printf("No IP address given.");
+        *err = g_strdup("No IP address given.");
         return FALSE;
     }
 
@@ -4928,14 +4928,14 @@ gboolean
 ssldecrypt_uat_fld_port_chk_cb(void* r _U_, const char* p, guint len _U_, const void* u1 _U_, const void* u2 _U_, char** err)
 {
     if (!p || strlen(p) == 0u) {
-        *err = g_strdup_printf("No Port given.");
+        *err = g_strdup("No Port given.");
         return FALSE;
     }
 
     if (strcmp(p, "start_tls") != 0){
         const gint i = atoi(p);
         if (i < 0 || i > 65535) {
-            *err = g_strdup_printf("Invalid port given.");
+            *err = g_strdup("Invalid port given.");
             return FALSE;
         }
     }
@@ -4950,7 +4950,7 @@ ssldecrypt_uat_fld_fileopen_chk_cb(void* r _U_, const char* p, guint len _U_, co
     ws_statb64 st;
 
     if (!p || strlen(p) == 0u) {
-        *err = g_strdup_printf("No filename given.");
+        *err = g_strdup("No filename given.");
         return FALSE;
     } else {
         if (ws_stat64(p, &st) != 0) {
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 6958ab74bd..6bab404798 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -3649,7 +3649,7 @@ static gboolean
 ssldecrypt_uat_fld_protocol_chk_cb(void* r _U_, const char* p, guint len _U_, const void* u1 _U_, const void* u2 _U_, char** err)
 {
     if (!p || strlen(p) == 0u) {
-        *err = g_strdup_printf("No protocol given.");
+        *err = g_strdup("No protocol given.");
         return FALSE;
     }
 
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c
index f1d2ce35ce..14c48d213a 100644
--- a/epan/dissectors/packet-zbee-nwk-gp.c
+++ b/epan/dissectors/packet-zbee-nwk-gp.c
@@ -610,7 +610,7 @@ uat_key_record_update_cb(void *r, char **err)
     uat_key_record_t *rec = (uat_key_record_t *)r;
 
     if (rec->string == NULL) {
-         *err = g_strdup_printf("Key can't be blank.");
+         *err = g_strdup("Key can't be blank.");
          return FALSE;
     } else {
         g_strstrip(rec->string);
@@ -622,7 +622,7 @@ uat_key_record_update_cb(void *r, char **err)
                 return FALSE;
             }
         } else {
-            *err = g_strdup_printf("Key can't be blank.");
+            *err = g_strdup("Key can't be blank.");
             return FALSE;
         }
     }
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index 3816f08080..25824b75b9 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -524,7 +524,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
     if (   (packet.dst == ZBEE_BCAST_ALL)
         || (packet.dst == ZBEE_BCAST_ACTIVE)
         || (packet.dst == ZBEE_BCAST_ROUTERS)){
-        dst_addr = wmem_strdup_printf(pinfo->pool, "Broadcast");
+        dst_addr = wmem_strdup(pinfo->pool, "Broadcast");
     }
     else {
         dst_addr = wmem_strdup_printf(pinfo->pool, "0x%04x", packet.dst);
@@ -549,7 +549,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
         || (packet.src == ZBEE_BCAST_ACTIVE)
         || (packet.src == ZBEE_BCAST_ROUTERS)){
         /* Source Broadcast doesn't make much sense. */
-        src_addr = wmem_strdup_printf(pinfo->pool, "Unexpected Source Broadcast");
+        src_addr = wmem_strdup(pinfo->pool, "Unexpected Source Broadcast");
         unicast_src = FALSE;
     }
     else {