diff options
50 files changed, 106 insertions, 114 deletions
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index f15110f995..5080907c99 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -1332,7 +1332,7 @@ sync_interface_set_80211_chan(const gchar *iface, const char *freq, const gchar if (type) opt = g_strdup_printf("%s,%s,%s,%s", freq, type, center_freq1, center_freq2); else - opt = g_strdup_printf("%s", freq); + opt = g_strdup(freq); if (!opt) { *primary_msg = g_strdup("Out of mem."); diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 4501d5d45f..8a5c7e10af 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -940,9 +940,9 @@ airpcap_get_if_string_number(airpcap_if_info_t* if_info) if (a == 0) { if (g_ascii_strcasecmp(if_info->name,AIRPCAP_DEVICE_ANY_EXTRACT_STRING)!=0) - number = g_strdup_printf("??"); + number = g_strdup("??"); else - number = g_strdup_printf(AIRPCAP_CHANNEL_ANY_NAME); + number = g_strdup(AIRPCAP_CHANNEL_ANY_NAME); } else { diff --git a/echld/echld-int.h b/echld/echld-int.h index 78c6032dc0..19dadd8213 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -176,7 +176,7 @@ char* paramset_get_params_list(param_t* paramsets, const char* fmt) G_GNUC_PRINT static echld_bool_t param_set_ ## Name (char* val , char** err _U_) { char* p; int temp = (int)strtol(val, &p, 10); if (p<=val) { *err = g_strdup("not an integer"); return FALSE; } else { param_ ## Name = temp; return TRUE; } } #define PARAM_BOOL(Name, Default) static gboolean param_ ## Name = Default; \ - static char* param_get_ ## Name (char** err _U_ ) { return g_strdup_printf("%s",param_ ## Name ? "TRUE" : "FALSE"); } \ + static char* param_get_ ## Name (char** err _U_ ) { return g_strdup(param_ ## Name ? "TRUE" : "FALSE"); } \ static echld_bool_t param_set_ ## Name (char* val , char** err _U_) { param_ ## Name = (*val == 'T' || *val == 't') ? TRUE : FALSE; return TRUE;} #define PARAM(Name,Desc) {#Name, param_get_ ## Name, param_set_ ## Name, Desc} 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 { diff --git a/epan/prefs.c b/epan/prefs.c index c5865baf9e..9a7a66e504 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -4829,7 +4829,7 @@ prefs_pref_to_str(pref_t *pref, pref_source_t source) { } case PREF_BOOL: - return g_strdup_printf("%s", (*(gboolean *) valp) ? "TRUE" : "FALSE"); + return g_strdup((*(gboolean *) valp) ? "TRUE" : "FALSE"); case PREF_ENUM: { diff --git a/extcap/ssh-base.c b/extcap/ssh-base.c index cc50417137..87c364f972 100644 --- a/extcap/ssh-base.c +++ b/extcap/ssh-base.c @@ -40,12 +40,12 @@ ssh_session create_ssh_connection(const char* hostname, const unsigned int port, /* Open session and set options */ sshs = ssh_new(); if (sshs == NULL) { - *err_info = g_strdup_printf("Can't create ssh session"); + *err_info = g_strdup("Can't create ssh session"); return NULL; } if (!hostname) { - *err_info = g_strdup_printf("Hostname needed"); + *err_info = g_strdup("Hostname needed"); goto failure; } diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 92adc460a2..175e6854d7 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -1338,7 +1338,7 @@ insert_new_rows(GList *list) * used. */ if (data_link_info->description != NULL) { - str = g_strdup_printf("%s", data_link_info->description); + str = g_strdup(data_link_info->description); linkr->dlt = data_link_info->dlt; } else { str = g_strdup_printf("%s (not supported)", data_link_info->name); @@ -3369,7 +3369,7 @@ static void change_pipe_name_cb(gpointer dialog _U_, gint btn, gpointer data) g_free(device.name); g_free(device.display_name); device.name = g_strdup((gchar *)data); - device.display_name = g_strdup_printf("%s", device.name); + device.display_name = g_strdup(device.name); g_array_remove_index(global_capture_opts.all_ifaces, i); g_array_insert_val(global_capture_opts.all_ifaces, i, device); temp = g_strdup_printf("<b>%s</b>", device.display_name); @@ -3479,7 +3479,7 @@ add_pipe_cb(gpointer w _U_) pipe_name = g_strdup(g_save_file); memset(&device, 0, sizeof(device)); device.name = g_strdup(g_save_file); - device.display_name = g_strdup_printf("%s", device.name); + device.display_name = g_strdup(device.name); device.hidden = FALSE; device.selected = TRUE; device.type = IF_PIPE; diff --git a/ui/gtk/filter_utils.c b/ui/gtk/filter_utils.c index 3e270eb7b3..502a5dfc70 100644 --- a/ui/gtk/filter_utils.c +++ b/ui/gtk/filter_utils.c @@ -45,20 +45,20 @@ apply_selected_filter (guint callback_action, const char *filter) switch(type){ case ACTYPE_SELECTED: - str = g_strdup_printf("%s", filter); + str = g_strdup(filter); break; case ACTYPE_NOT_SELECTED: str = g_strdup_printf("!(%s)", filter); break; case ACTYPE_AND_SELECTED: if ((!current_filter) || (0 == strlen(current_filter))) - str = g_strdup_printf("%s", filter); + str = g_strdup(filter); else str = g_strdup_printf("(%s) && (%s)", current_filter, filter); break; case ACTYPE_OR_SELECTED: if ((!current_filter) || (0 == strlen(current_filter))) - str = g_strdup_printf("%s", filter); + str = g_strdup(filter); else str = g_strdup_printf("(%s) || (%s)", current_filter, filter); break; diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 71a4d8e15d..863d16f372 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -543,13 +543,13 @@ get_ip_address_list_from_packet_list_row(gpointer data) /* First check selected column */ if (is_address_column (column)) { - addr_list = g_list_append (addr_list, g_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[column])); + addr_list = g_list_append (addr_list, g_strdup(cfile.cinfo.col_expr.col_expr_val[column])); } for (col = 0; col < cfile.cinfo.num_cols; col++) { /* Then check all columns except the selected */ if ((col != column) && (is_address_column (col))) { - addr_list = g_list_append (addr_list, g_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[col])); + addr_list = g_list_append (addr_list, g_strdup(cfile.cinfo.col_expr.col_expr_val[col])); } } diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 715042a95b..8858eeeb4e 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -190,7 +190,7 @@ column_prefs_show(GtkWidget *prefs_window) { cfmt->custom_fields = NULL; cfmt->custom_occurrence = 0; } - fmt = g_strdup_printf("%s", col_format_desc(cfmt->fmt)); + fmt = g_strdup(col_format_desc(cfmt->fmt)); } gtk_list_store_insert_with_values(store, &iter, G_MAXINT, VISIBLE_COLUMN, cfmt->visible, @@ -561,7 +561,7 @@ column_menu_changed_cb(GtkWidget *w, gpointer data) { /* Changing from custom to non-custom */ gtk_editable_delete_text(GTK_EDITABLE(field_te), 0, -1); gtk_editable_delete_text(GTK_EDITABLE(occurrence_te), 0, -1); - fmt = g_strdup_printf("%s", col_format_desc(cur_cb_fmt)); + fmt = g_strdup(col_format_desc(cur_cb_fmt)); gtk_widget_set_sensitive(field_lb, FALSE); gtk_widget_set_sensitive(field_te, FALSE); gtk_widget_set_sensitive(occurrence_lb, FALSE); @@ -588,7 +588,7 @@ column_menu_changed_cb(GtkWidget *w, gpointer data) { } else { /* Changing from non-custom to non-custom */ - fmt = g_strdup_printf("%s", col_format_desc(cur_cb_fmt)); + fmt = g_strdup(col_format_desc(cur_cb_fmt)); } g_signal_handler_unblock(occurrence_te, column_occurrence_changed_handler_id); g_signal_handler_unblock(field_te, column_field_changed_handler_id); diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 041e9aac25..6f271bc6f5 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -84,7 +84,7 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g gtk_tree_model_get (model, &iter, FILTER_NAME, &filter, -1); if (filter && strlen(filter) > 0) { - str = g_strdup_printf("%s", filter); + str = g_strdup(filter); } else { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter!\nTry expanding or choosing another item."); return; @@ -92,7 +92,7 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g while (gtk_tree_path_up(path) && gtk_tree_path_get_depth(path) > 0) { - strtmp = g_strdup_printf("%s", str); + strtmp = g_strdup(str); g_free(str); gtk_tree_model_get_iter(model, &iter, path); diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 8900b34b36..23fb5159e1 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -548,7 +548,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) dstlist = g_list_next(dstlist); wmem_free(NULL, addr_str); } - str = g_strdup_printf(")))"); + str = g_strdup(")))"); g_string_append(gstring, str); filter_string = g_string_free(gstring, FALSE); } diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 59d57ae0ee..188437d6ec 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -536,7 +536,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_) wmem_free(NULL, addr_str); dstlist = g_list_next(dstlist); } - str = g_strdup_printf(")))"); + str = g_strdup(")))"); g_string_append(gstring, str); filter_string = g_string_free(gstring,FALSE); } diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index 1562c13e44..f421e1b693 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -456,7 +456,7 @@ init_gtk_tree(const char* opt_arg, void *userdata _U_) title=g_strdup_printf("%s with filter: %s",st->display_name,st->filter); } else { st->filter=NULL; - title=g_strdup_printf("%s", st->display_name); + title=g_strdup(st->display_name); } gtk_window_set_title(GTK_WINDOW(st->pr->win), title); @@ -585,7 +585,7 @@ void gtk_stats_tree_cb(GtkAction *action, gpointer user_data _U_) if(abbr){ abbr = abbr+1; }else{ - abbr = g_strdup_printf("%s",action_name); + abbr = g_strdup(action_name); } cfg = stats_tree_get_cfg_by_abbr(abbr); if(cfg){ diff --git a/ui/iface_lists.c b/ui/iface_lists.c index 10cb277522..429cc0f67e 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.c @@ -250,7 +250,7 @@ scan_local_interfaces(void (*update_cb)(void)) link = (link_row *)g_malloc(sizeof(link_row)); if (data_link_info->description != NULL) { link->dlt = data_link_info->dlt; - link->name = g_strdup_printf("%s", data_link_info->description); + link->name = g_strdup(data_link_info->description); } else { link->dlt = -1; link->name = g_strdup_printf("%s (not supported)", data_link_info->name); @@ -326,7 +326,7 @@ scan_local_interfaces(void (*update_cb)(void)) device.name = g_strdup(interface_opts.name); device.display_name = interface_opts.descr ? g_strdup_printf("%s: %s", device.name, interface_opts.descr) : - g_strdup_printf("%s", device.name); + g_strdup(device.name); device.hidden = FALSE; device.selected = TRUE; device.type = IF_PIPE; diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index 5ce7c5dd82..96f8964f16 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -608,7 +608,7 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r * used. */ if (data_link_info->description != NULL) { - str = g_strdup_printf("%s", data_link_info->description); + str = g_strdup(data_link_info->description); linkr->dlt = data_link_info->dlt; } else { str = g_strdup_printf("%s (not supported)", data_link_info->name); diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index c443723e9e..ac48c3b5f3 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -120,18 +120,18 @@ wtap_open_return_val btsnoop_open(wtap *wth, int *err, gchar **err_info) break; case KHciLoggerDatalinkTypeBCSP: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: BCSP capture logs unsupported"); + *err_info = g_strdup("btsnoop: BCSP capture logs unsupported"); return WTAP_OPEN_ERROR; case KHciLoggerDatalinkTypeH5: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: H5 capture logs unsupported"); + *err_info = g_strdup("btsnoop: H5 capture logs unsupported"); return WTAP_OPEN_ERROR; case KHciLoggerDatalinkLinuxMonitor: file_encap=WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR; break; case KHciLoggerDatalinkBlueZ5Simulator: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: BlueZ 5 Simulator capture logs unsupported"); + *err_info = g_strdup("btsnoop: BlueZ 5 Simulator capture logs unsupported"); return WTAP_OPEN_ERROR; default: *err = WTAP_ERR_UNSUPPORTED; diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 81a4970105..e7987f62b6 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -226,7 +226,7 @@ static gboolean dct3trace_get_packet(FILE_T fh, struct wtap_pkthdr *phdr, { /* If not got any data return error */ *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("dct3trace: record without data"); + *err_info = g_strdup("dct3trace: record without data"); return FALSE; } } @@ -338,7 +338,7 @@ static gboolean dct3trace_get_packet(FILE_T fh, struct wtap_pkthdr *phdr, baddata: *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("dct3trace: record missing mandatory attributes"); + *err_info = g_strdup("dct3trace: record missing mandatory attributes"); return FALSE; } diff --git a/wiretap/erf.c b/wiretap/erf.c index b31562b0f5..04a1bb5be8 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -520,7 +520,7 @@ static gboolean erf_read_header(wtap *wth, FILE_T fh, /* If this isn't a pad record, it's a corrupt packet; bail out */ if ((erf_header->type & 0x7F) != ERF_TYPE_PAD) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("erf: File has 0 byte packet"); + *err_info = g_strdup("erf: File has 0 byte packet"); return FALSE; } diff --git a/wiretap/netmon.c b/wiretap/netmon.c index a7e2ea6eab..f258eac836 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -746,7 +746,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, */ if (!filetime_to_nstime(&phdr->ts, d)) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("netmon: time stamp outside supported range"); + *err_info = g_strdup("netmon: time stamp outside supported range"); return FAILURE; } } diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index da5929885c..3d78c3d57b 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -597,7 +597,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) if (type != REC_VERS) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("ngsniffer: Sniffer file doesn't start with a version record"); + *err_info = g_strdup("ngsniffer: Sniffer file doesn't start with a version record"); return WTAP_OPEN_ERROR; } @@ -892,7 +892,7 @@ process_rec_header2_v2(wtap *wth, unsigned char *buffer, guint16 length, * There's not enough data to compare. */ *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("ngsniffer: WAN capture has too-short protocol list"); + *err_info = g_strdup("ngsniffer: WAN capture has too-short protocol list"); return -1; } diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 8ce6c6ef7c..16e3589b8c 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1738,7 +1738,7 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, case WTAP_ENCAP_NFC_LLCP: if (check_packet_size && packet_size < LLCP_HEADER_LEN) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("pcap: libpcap llcp file too short"); + *err_info = g_strdup("pcap: libpcap llcp file too short"); return -1; } if (!pcap_read_llcp_pseudoheader(fh, &phdr->pseudo_header, err, err_info)) diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 4ff3afeaa2..a91b35c8c8 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -562,7 +562,7 @@ pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh, /* We currently only suport one SHB */ if (pn->shb_read == TRUE) { *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("pcapng_read_section_header_block: multiple section header blocks not supported"); + *err_info = g_strdup("pcapng_read_section_header_block: multiple section header blocks not supported"); return PCAPNG_BLOCK_ERROR; } @@ -1407,7 +1407,7 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t * if (0 >= pn->interfaces->len) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("pcapng_read_simple_packet_block: SPB appeared before any IDBs"); + *err_info = g_strdup("pcapng_read_simple_packet_block: SPB appeared before any IDBs"); return FALSE; } iface_info = g_array_index(pn->interfaces, interface_info_t, 0); @@ -2584,7 +2584,7 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wth->phdr.pkt_encap = WTAP_ENCAP_UNKNOWN; wth->phdr.pkt_tsprec = WTAP_TSPREC_UNKNOWN; *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("pcapng: multi-section files not currently supported"); + *err_info = g_strdup("pcapng: multi-section files not currently supported"); return FALSE; case(BLOCK_TYPE_PB): diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 24eaad1406..25ed2e29d9 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -734,7 +734,7 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, t = (((guint64) timestamp.upper) << 32) + timestamp.lower; if (!nsfiletime_to_nstime(&phdr->ts, t)) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("peektagged: time stamp outside supported range"); + *err_info = g_strdup("peektagged: time stamp outside supported range"); return -1; } diff --git a/wiretap/vms.c b/wiretap/vms.c index 2133c7802d..e9fc9a423a 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -371,7 +371,7 @@ parse_vms_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gch /* We will need to add code to handle new format */ if (num_items_scanned != 8) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("vms: header line not valid"); + *err_info = g_strdup("vms: header line not valid"); return FALSE; } } @@ -382,7 +382,7 @@ parse_vms_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gch if ( !*p ) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("vms: Length field not valid"); + *err_info = g_strdup("vms: Length field not valid"); return FALSE; } @@ -446,7 +446,7 @@ parse_vms_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gch if (!parse_single_hex_dump_line(line, pd, i, offset, pkt_len - i)) { *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("vms: hex dump not valid"); + *err_info = g_strdup("vms: hex dump not valid"); return FALSE; } } |