diff options
Diffstat (limited to 'epan/dissectors')
70 files changed, 300 insertions, 300 deletions
diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c index 7c312db9b1..6f34c361d5 100644 --- a/epan/dissectors/asn1/camel/packet-camel-template.c +++ b/epan/dissectors/asn1/camel/packet-camel-template.c @@ -1183,9 +1183,9 @@ static void camel_stat_init(stat_tap_table_ui* new_stat) const char *ocs = try_val_to_str(i, camel_opr_code_strings); char *col_str; if (ocs) { - col_str = g_strdup_printf("Request %s", ocs); + col_str = ws_strdup_printf("Request %s", ocs); } else { - col_str = g_strdup_printf("Unknown op code %d", i); + col_str = ws_strdup_printf("Unknown op code %d", i); } items[MESSAGE_TYPE_COLUMN].value.string_value = col_str; diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c index 8d8ad4e171..cec724fa62 100644 --- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c +++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c @@ -2764,7 +2764,7 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat) if (ocs) { col_str = g_strdup(ocs); } else { - col_str = g_strdup_printf("Unknown op code %d", i); + col_str = ws_strdup_printf("Unknown op code %d", i); } items[ID_COLUMN].value.uint_value = i; diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index b1e63b95c3..636eaedd39 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -483,7 +483,7 @@ attribute_types_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->attribute_type); if (c) { - *err = g_strdup_printf("Attribute type can't contain '%c'", c); + *err = ws_strdup_printf("Attribute type can't contain '%c'", c); return FALSE; } @@ -576,7 +576,7 @@ attribute_types_post_update_cb(void) dynamic_hf[i].p_id = hf_id; dynamic_hf[i].hfinfo.name = attribute_type; - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("ldap.AttributeValue.%s", attribute_type); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("ldap.AttributeValue.%s", attribute_type); dynamic_hf[i].hfinfo.type = FT_STRING; dynamic_hf[i].hfinfo.display = BASE_NONE; dynamic_hf[i].hfinfo.strings = NULL; diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index 774661b0a1..d8e75fe75d 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -196,7 +196,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, /* XXX - add other hardware exception codes as required */ default: show_exception(tvb, pinfo, parent_tree, DissectorError, - g_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); + ws_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); } } #endif @@ -261,7 +261,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, /* XXX - add other hardware exception codes as required */ default: show_exception(tvb, pinfo, parent_tree, DissectorError, - g_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); + ws_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); } } #endif diff --git a/epan/dissectors/packet-autosar-ipdu-multiplexer.c b/epan/dissectors/packet-autosar-ipdu-multiplexer.c index 850e5802a0..65f185dc13 100644 --- a/epan/dissectors/packet-autosar-ipdu-multiplexer.c +++ b/epan/dissectors/packet-autosar-ipdu-multiplexer.c @@ -194,22 +194,22 @@ update_ipdum_message_list(void *r, char **err) { ipdum_message_list_uat_t *rec = (ipdum_message_list_uat_t *)r; if (rec->pos >= 0xffff) { - *err = g_strdup_printf("Position too big"); + *err = ws_strdup_printf("Position too big"); return FALSE; } if (rec->num_of_params >= 0xffff) { - *err = g_strdup_printf("Number of PDUs too big"); + *err = ws_strdup_printf("Number of PDUs too big"); return FALSE; } if (rec->pos >= rec->num_of_params) { - *err = g_strdup_printf("Position >= Number of PDUs"); + *err = ws_strdup_printf("Position >= Number of PDUs"); return FALSE; } if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } @@ -414,12 +414,12 @@ update_ipdum_flexray_mapping(void *r, char **err) { ipdum_flexray_mapping_uat_t *rec = (ipdum_flexray_mapping_uat_t *)r; if (rec->cycle > 0xff) { - *err = g_strdup_printf("We currently only support 8 bit Cycles (Cycle: %i Frame ID: %i)", rec->cycle, rec->frame_id); + *err = ws_strdup_printf("We currently only support 8 bit Cycles (Cycle: %i Frame ID: %i)", rec->cycle, rec->frame_id); return FALSE; } if (rec->frame_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit Frame IDs (Cycle: %i Frame ID: %i)", rec->cycle, rec->frame_id); + *err = ws_strdup_printf("We currently only support 16 bit Frame IDs (Cycle: %i Frame ID: %i)", rec->cycle, rec->frame_id); return FALSE; } @@ -492,12 +492,12 @@ update_ipdum_lin_mapping(void *r, char **err) { ipdum_lin_mapping_uat_t *rec = (ipdum_lin_mapping_uat_t *)r; if (rec->frame_id > LIN_ID_MASK) { - *err = g_strdup_printf("LIN Frame IDs are only uint with 6 bits (ID: %i)", rec->frame_id); + *err = ws_strdup_printf("LIN Frame IDs are only uint with 6 bits (ID: %i)", rec->frame_id); return FALSE; } if (rec->bus_id > 0xffff) { - *err = g_strdup_printf("LIN Bus IDs are only uint with 16 bits (ID: 0x%x, Bus ID: 0x%x)", rec->frame_id, rec->bus_id); + *err = ws_strdup_printf("LIN Bus IDs are only uint with 16 bits (ID: 0x%x, Bus ID: 0x%x)", rec->frame_id, rec->bus_id); return FALSE; } @@ -597,7 +597,7 @@ update_ipdum_pdu_transport_mapping(void *r, char **err) { ipdum_pdu_transport_mapping_uat_t *rec = (ipdum_pdu_transport_mapping_uat_t *)r; if (rec->pdu_id > 0xffffffff) { - *err = g_strdup_printf("PDU-Transport IDs are only uint32 (ID: %i)", rec->pdu_id); + *err = ws_strdup_printf("PDU-Transport IDs are only uint32 (ID: %i)", rec->pdu_id); return FALSE; } diff --git a/epan/dissectors/packet-autosar-nm.c b/epan/dissectors/packet-autosar-nm.c index 5992396412..f7107dc4eb 100644 --- a/epan/dissectors/packet-autosar-nm.c +++ b/epan/dissectors/packet-autosar-nm.c @@ -153,35 +153,35 @@ user_data_fields_update_cb(void *r, char **err) *err = NULL; if (rec->udf_length == 0) { - *err = g_strdup_printf("length of user data field can't be 0 Bytes (name: %s offset: %i length: %i)", rec->udf_name, rec->udf_offset, rec->udf_length); + *err = ws_strdup_printf("length of user data field can't be 0 Bytes (name: %s offset: %i length: %i)", rec->udf_name, rec->udf_offset, rec->udf_length); return (*err == NULL); } if (rec->udf_length > 8) { - *err = g_strdup_printf("length of user data field can't be greater 8 Bytes (name: %s offset: %i length: %i)", rec->udf_name, rec->udf_offset, rec->udf_length); + *err = ws_strdup_printf("length of user data field can't be greater 8 Bytes (name: %s offset: %i length: %i)", rec->udf_name, rec->udf_offset, rec->udf_length); return (*err == NULL); } if (rec->udf_mask >= G_MAXUINT64) { - *err = g_strdup_printf("mask can only be up to 64bits (name: %s)", rec->udf_name); + *err = ws_strdup_printf("mask can only be up to 64bits (name: %s)", rec->udf_name); return (*err == NULL); } if (rec->udf_name == NULL) { - *err = g_strdup_printf("Name of user data field can't be empty"); + *err = ws_strdup_printf("Name of user data field can't be empty"); return (*err == NULL); } g_strstrip(rec->udf_name); if (rec->udf_name[0] == 0) { - *err = g_strdup_printf("Name of user data field can't be empty"); + *err = ws_strdup_printf("Name of user data field can't be empty"); return (*err == NULL); } /* Check for invalid characters (to avoid asserting out when registering the field). */ c = proto_check_field_name(rec->udf_name); if (c) { - *err = g_strdup_printf("Name of user data field can't contain '%c'", c); + *err = ws_strdup_printf("Name of user data field can't contain '%c'", c); return (*err == NULL); } @@ -236,7 +236,7 @@ static gchar* calc_hf_key(user_data_field_t udf) { gchar* ret = NULL; - ret = g_strdup_printf("%i-%i-%" PRIu64 "-%s", udf.udf_offset, udf.udf_length, udf.udf_mask, udf.udf_name); + ret = ws_strdup_printf("%i-%i-%" PRIu64 "-%s", udf.udf_offset, udf.udf_length, udf.udf_mask, udf.udf_name); return ret; } @@ -339,14 +339,14 @@ user_data_post_update_cb(void) if (user_data_fields[i].udf_mask == 0 || user_data_fields[i].udf_length <= 0 || user_data_fields[i].udf_length>8) { dynamic_hf[i].hfinfo.name = g_strdup(user_data_fields[i].udf_name); - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("autosar-nm.user_data.%s", user_data_fields[i].udf_name); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("autosar-nm.user_data.%s", user_data_fields[i].udf_name); dynamic_hf[i].hfinfo.type = FT_BYTES; dynamic_hf[i].hfinfo.display = BASE_NONE; dynamic_hf[i].hfinfo.bitmask = 0; dynamic_hf[i].hfinfo.blurb = g_strdup(user_data_fields[i].udf_desc); } else { dynamic_hf[i].hfinfo.name = g_strdup(user_data_fields[i].udf_value_desc); - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("autosar-nm.user_data.%s.%s", user_data_fields[i].udf_name, user_data_fields[i].udf_value_desc); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("autosar-nm.user_data.%s.%s", user_data_fields[i].udf_name, user_data_fields[i].udf_value_desc); dynamic_hf[i].hfinfo.type = FT_BOOLEAN; dynamic_hf[i].hfinfo.display = 8 * (user_data_fields[i].udf_length); /* dynamic_hf[i].hfinfo.bitmask = 0; */ diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 1b27841c26..1370dc928a 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -856,7 +856,7 @@ de_bssgp_cell_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of proto_tree_add_item(tree, hf_bssgp_ci, tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset+=2; if (add_string) { - char *str = g_strdup_printf("%s, CI %u", add_string, ci); + char *str = ws_strdup_printf("%s, CI %u", add_string, ci); g_strlcpy(add_string, str, string_len); g_free(str); } @@ -2312,7 +2312,7 @@ de_bssgp_rim_routing_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gu proto_tree_add_item(tree, hf_bssgp_rnc_id, tvb, curr_offset, 2, ENC_BIG_ENDIAN); if (add_string) { - char *str = g_strdup_printf(" %s, RNC-ID %u", add_string, rnc_id); + char *str = ws_strdup_printf(" %s, RNC-ID %u", add_string, rnc_id); g_strlcpy(add_string, str, string_len); g_free(str); } @@ -2769,7 +2769,7 @@ de_bssgp_rnc_identifier(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui curr_offset+=2; if (add_string) { - char *str = g_strdup_printf(" %s, RNC-ID %u", add_string, rnc_id); + char *str = ws_strdup_printf(" %s, RNC-ID %u", add_string, rnc_id); g_strlcpy(add_string, str, string_len); g_free(str); } diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index 4eac4d0206..f614e290b6 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -8207,7 +8207,7 @@ compute_ascii_key(guchar **ascii_key, const gchar *key, const gchar *key_name, g { g_free(*ascii_key); *ascii_key = NULL; - *err = g_strdup_printf("Key %s begins with an invalid hex char (%c)", key, key[i]); + *err = ws_strdup_printf("Key %s begins with an invalid hex char (%c)", key, key[i]); return -1; /* not a valid hex digit */ } (*ascii_key)[j] = (guchar)hex_digit; @@ -8230,7 +8230,7 @@ compute_ascii_key(guchar **ascii_key, const gchar *key, const gchar *key_name, g { g_free(*ascii_key); *ascii_key = NULL; - *err = g_strdup_printf("%s %s has an invalid hex char (%c)", key_name, key, key[i-1]); + *err = ws_strdup_printf("%s %s has an invalid hex char (%c)", key_name, key, key[i-1]); return -1; /* not a valid hex digit */ } key_byte = ((guchar)hex_digit) << 4; @@ -8240,7 +8240,7 @@ compute_ascii_key(guchar **ascii_key, const gchar *key, const gchar *key_name, g { g_free(*ascii_key); *ascii_key = NULL; - *err = g_strdup_printf("%s %s has an invalid hex char (%c)", key_name, key, key[i-1]); + *err = ws_strdup_printf("%s %s has an invalid hex char (%c)", key_name, key, key[i-1]); return -1; /* not a valid hex digit */ } key_byte |= (guchar)hex_digit; @@ -8250,7 +8250,7 @@ compute_ascii_key(guchar **ascii_key, const gchar *key, const gchar *key_name, g (*ascii_key)[j] = '\0'; } else { *ascii_key = NULL; - *err = g_strdup_printf("%s %s has to start with '0x' or '0X', and represent exactly %d octets", key_name, key, expected_octets); + *err = ws_strdup_printf("%s %s has to start with '0x' or '0X', and represent exactly %d octets", key_name, key, expected_octets); return -1; } } diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index caeb0dd2c0..d6f23daa99 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -8213,9 +8213,9 @@ static void camel_stat_init(stat_tap_table_ui* new_stat) const char *ocs = try_val_to_str(i, camel_opr_code_strings); char *col_str; if (ocs) { - col_str = g_strdup_printf("Request %s", ocs); + col_str = ws_strdup_printf("Request %s", ocs); } else { - col_str = g_strdup_printf("Unknown op code %d", i); + col_str = ws_strdup_printf("Unknown op code %d", i); } items[MESSAGE_TYPE_COLUMN].value.string_value = col_str; diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 444fff565b..2686f6d551 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -525,7 +525,7 @@ dccp_build_filter(packet_info *pinfo) { if( pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4 ) { /* DCCP over IPv4 */ - return g_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (dccp.port eq %d and dccp.port eq %d)", + return ws_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (dccp.port eq %d and dccp.port eq %d)", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); @@ -533,7 +533,7 @@ dccp_build_filter(packet_info *pinfo) if( pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6 ) { /* DCCP over IPv6 */ - return g_strdup_printf("(ipv6.addr eq %s and ipv6.addr eq %s) and (dccp.port eq %d and dccp.port eq %d)", + return ws_strdup_printf("(ipv6.addr eq %s and ipv6.addr eq %s) and (dccp.port eq %d and dccp.port eq %d)", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); @@ -554,7 +554,7 @@ static gchar *dccp_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinf /* DCCP over IPv4/6 */ dccpd = get_dccp_conversation_data(conv, pinfo); *stream = dccpd->stream; - return g_strdup_printf("dccp.stream eq %u", dccpd->stream); + return ws_strdup_printf("dccp.stream eq %u", dccpd->stream); } return NULL; @@ -562,7 +562,7 @@ static gchar *dccp_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinf static gchar *dccp_follow_index_filter(guint stream, guint sub_stream _U_) { - return g_strdup_printf("dccp.stream eq %u", stream); + return ws_strdup_printf("dccp.stream eq %u", stream); } static gchar *dccp_follow_address_filter(address *src_addr, address *dst_addr, int src_port, int dst_port) @@ -574,7 +574,7 @@ static gchar *dccp_follow_address_filter(address *src_addr, address *dst_addr, i address_to_str_buf(src_addr, src_addr_str, sizeof(src_addr_str)); address_to_str_buf(dst_addr, dst_addr_str, sizeof(dst_addr_str)); - return g_strdup_printf("((ip%s.src eq %s and dccp.srcport eq %d) and " + return ws_strdup_printf("((ip%s.src eq %s and dccp.srcport eq %d) and " "(ip%s.dst eq %s and dccp.dstport eq %d))" " or " "((ip%s.src eq %s and dccp.srcport eq %d) and " diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 2e45251813..8a2bec6635 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2039,11 +2039,11 @@ dcerpcstat_param(register_srt_t* srt, const char* opt_arg, char** err) &d1,&d2,&d3,&d40,&d41,&d42,&d43,&d44,&d45,&d46,&d47,&major,&minor,&pos) == 13) { if ((major < 0) || (major > 65535)) { - *err = g_strdup_printf("dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535", major); + *err = ws_strdup_printf("dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535", major); return pos; } if ((minor < 0) || (minor > 65535)) { - *err = g_strdup_printf("dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535", minor); + *err = ws_strdup_printf("dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535", minor); return pos; } ver = major; @@ -2079,7 +2079,7 @@ dcerpcstat_param(register_srt_t* srt, const char* opt_arg, char** err) } else { - *err = g_strdup_printf("<uuid>,<major version>.<minor version>[,<filter>]"); + *err = ws_strdup_printf("<uuid>,<major version>.<minor version>[,<filter>]"); } return pos; diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index b5c26c31e6..c2a1754ff9 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -1667,7 +1667,7 @@ static gboolean uat_dhcp_record_update_cb(void* r, char** err) { uat_dhcp_record_t* rec = (uat_dhcp_record_t *)r; if ((rec->opt == 0) || (rec->opt >=DHCP_OPT_NUM-1)) { - *err = g_strdup_printf("Option must be between 1 and %d", DHCP_OPT_NUM-2); + *err = ws_strdup_printf("Option must be between 1 and %d", DHCP_OPT_NUM-2); return FALSE; } return TRUE; diff --git a/epan/dissectors/packet-doip.c b/epan/dissectors/packet-doip.c index ac5b137453..fe3004418d 100644 --- a/epan/dissectors/packet-doip.c +++ b/epan/dissectors/packet-doip.c @@ -472,7 +472,7 @@ update_generic_one_identifier_16bit(void *r, char **err) { generic_one_id_string_t *rec = (generic_one_id_string_t *)r; if (rec->id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); return FALSE; } diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index be3fe72449..6a07774def 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -1799,12 +1799,12 @@ dtlsdecrypt_uat_fld_protocol_chk_cb(void* r _U_, const char* p, guint len _U_, c if (!find_dissector(p)) { if (proto_get_id_by_filter_name(p) != -1) { - *err = g_strdup_printf("While '%s' is a valid dissector filter name, that dissector is not configured" + *err = ws_strdup_printf("While '%s' is a valid dissector filter name, that dissector is not configured" " to support DTLS decryption.\n\n" "If you need to decrypt '%s' over DTLS, please contact the Wireshark development team.", p, p); } else { char* ssl_str = ssl_association_info("dtls.port", "UDP"); - *err = g_strdup_printf("Could not find dissector for: '%s'\nCommonly used DTLS dissectors include:\n%s", p, ssl_str); + *err = ws_strdup_printf("Could not find dissector for: '%s'\nCommonly used DTLS dissectors include:\n%s", p, ssl_str); g_free(ssl_str); } return FALSE; diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 9136105642..76ad7dd448 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -990,7 +990,7 @@ enip_io_conv_filter(packet_info *pinfo) if (conn->close_frame > 0) { - buf = g_strdup_printf( + buf = ws_strdup_printf( "((frame.number == %u) || ((frame.number >= %u) && (frame.number <= %u))) && " /* Frames between ForwardOpen and ForwardClose reply */ "((enip.cpf.sai.connid == 0x%08x || enip.cpf.sai.connid == 0x%08x) || " /* O->T and T->O Connection IDs */ "((cip.cm.conn_serial_num == 0x%04x) && (cip.cm.vendor == 0x%04x) && (cip.cm.orig_serial_num == 0x%08x)))", /* Connection Triad */ @@ -1001,7 +1001,7 @@ enip_io_conv_filter(packet_info *pinfo) else { /* If Forward Close isn't found, don't limit the (end) frame range */ - buf = g_strdup_printf( + buf = ws_strdup_printf( "((frame.number == %u) || (frame.number >= %u)) && " /* Frames starting with ForwardOpen */ "((enip.cpf.sai.connid == 0x%08x || enip.cpf.sai.connid == 0x%08x) || " /* O->T and T->O Connection IDs */ "((cip.cm.conn_serial_num == 0x%04x) && (cip.cm.vendor == 0x%04x) && (cip.cm.orig_serial_num == 0x%08x)))", /* Connection Triad */ @@ -1036,7 +1036,7 @@ enip_exp_conv_filter(packet_info *pinfo) if (conn->close_frame > 0) { - buf = g_strdup_printf( + buf = ws_strdup_printf( "((frame.number == %u) || ((frame.number >= %u) && (frame.number <= %u))) && " /* Frames between ForwardOpen and ForwardClose reply */ "((enip.cpf.cai.connid == 0x%08x || enip.cpf.cai.connid == 0x%08x) || " /* O->T and T->O Connection IDs */ "((cip.cm.conn_serial_num == 0x%04x) && (cip.cm.vendor == 0x%04x) && (cip.cm.orig_serial_num == 0x%08x)))", /* Connection Triad */ @@ -1047,7 +1047,7 @@ enip_exp_conv_filter(packet_info *pinfo) else { /* If Forward Close isn't found, don't limit the (end) frame range */ - buf = g_strdup_printf( + buf = ws_strdup_printf( "((frame.number == %u) || (frame.number >= %u)) && " /* Frames between ForwardOpen and ForwardClose */ "((enip.cpf.cai.connid == 0x%08x || enip.cpf.cai.connid == 0x%08x) || " /* O->T and T->O Connection IDs */ "((cip.cm.conn_serial_num == 0x%04x) && (cip.cm.vendor == 0x%04x) && (cip.cm.orig_serial_num == 0x%08x)))", /* Connection Triad */ diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 076ada62a6..debd174010 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -6503,7 +6503,7 @@ epl_profile_uat_fld_fileopen_check_cb(void *record _U_, const char *path, guint if (ws_stat64(path, &st) != 0) { - *err = g_strdup_printf("File '%s' does not exist or access was denied.", path); + *err = ws_strdup_printf("File '%s' does not exist or access was denied.", path); return FALSE; } @@ -6520,7 +6520,7 @@ epl_profile_uat_fld_fileopen_check_cb(void *record _U_, const char *path, guint *err = NULL; return TRUE; #else - *err = g_strdup_printf("*.xdd and *.xdc support not compiled in. %s", supported); + *err = ws_strdup_printf("*.xdd and *.xdc support not compiled in. %s", supported); return FALSE; #endif } diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 93f635c9e4..f3c1f10298 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -298,7 +298,7 @@ add_symbols_of_file(const char *filename) pos = strcspn(line, ","); if ((line[pos] != '\0') && (line[pos+1] !='\0')) /* require at least 1 char in symbol */ gbl_symbols_array_append(hash, - g_strdup_printf("%." ETCH_MAX_SYMBOL_LENGTH "s", &line[pos+1])); + ws_strdup_printf("%." ETCH_MAX_SYMBOL_LENGTH "s", &line[pos+1])); } fclose(pFile); } @@ -335,7 +335,7 @@ read_hashed_symbols_from_dir(const char *dirname) if (g_str_has_suffix(file, ".ewh")) { filename = - g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dirname, + ws_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dirname, name); add_symbols_of_file(filename); g_free(filename); diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 361591c7b2..64349a4281 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -197,7 +197,7 @@ eth_filter_valid(packet_info *pinfo) static gchar* eth_build_filter(packet_info *pinfo) { - return g_strdup_printf("eth.addr eq %s and eth.addr eq %s", + return ws_strdup_printf("eth.addr eq %s and eth.addr eq %s", address_to_str(pinfo->pool, &pinfo->dl_src), address_to_str(pinfo->pool, &pinfo->dl_dst)); } diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 7924d8075c..708d055c3d 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -480,7 +480,7 @@ f5_udp_conv_valid(packet_info *pinfo) * @return A filter string for the F5 IP conversation or NULL if no filter can be * computed. The caller should free this string with g_free(). * - * @attention This function uses g_strdup_printf() rather than the wmem equivalent because the + * @attention This function uses ws_strdup_printf() rather than the wmem equivalent because the * caller (menu_dissector_filter_cb()) uses g_free to free the filter string. * (as of WS 1.12). */ @@ -496,7 +496,7 @@ f5_ip_conv_filter(packet_info *pinfo) address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); if (*src_addr != '\0' && *dst_addr != '\0') { - buf = g_strdup_printf( + buf = ws_strdup_printf( "(ip.addr eq %s and ip.addr eq %s) or" " (f5ethtrailer.peeraddr eq %s and f5ethtrailer.peeraddr eq %s)", src_addr, dst_addr, src_addr, dst_addr); @@ -505,7 +505,7 @@ f5_ip_conv_filter(packet_info *pinfo) address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); if (*src_addr != '\0' && *dst_addr != '\0') { - buf = g_strdup_printf( + buf = ws_strdup_printf( "(ipv6.addr eq %s and ipv6.addr eq %s) or" " (f5ethtrailer.peeraddr6 eq %s and f5ethtrailer.peeraddr6 eq %s)", src_addr, dst_addr, src_addr, dst_addr); @@ -535,7 +535,7 @@ f5_ip_conv_filter(packet_info *pinfo) * be filtered properly. In the >=11.0.0 case, if you have TCP on one side and UDP on the other * and it should "do the right thing". * - * @attention This function uses g_strdup_printf() rather than the wmem equivalent because the + * @attention This function uses ws_strdup_printf() rather than the wmem equivalent because the * caller (menu_dissector_filter_cb()) uses g_free to free the filter string. * (as of WS 1.12). */ @@ -551,7 +551,7 @@ f5_tcp_conv_filter(packet_info *pinfo) address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); if (*src_addr != '\0' && *dst_addr != '\0') { - buf = g_strdup_printf( + buf = ws_strdup_printf( "(ip.addr eq %s and ip.addr eq %s and tcp.port eq %d and tcp.port eq %d) or" " (f5ethtrailer.peeraddr eq %s and f5ethtrailer.peeraddr eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" @@ -563,7 +563,7 @@ f5_tcp_conv_filter(packet_info *pinfo) address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); if (*src_addr != '\0' && *dst_addr != '\0') { - buf = g_strdup_printf( + buf = ws_strdup_printf( "(ipv6.addr eq %s and ipv6.addr eq %s and tcp.port eq %d and tcp.port eq %d) or" " (f5ethtrailer.peeraddr6 eq %s and f5ethtrailer.peeraddr6 eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" @@ -595,7 +595,7 @@ f5_tcp_conv_filter(packet_info *pinfo) * be filtered properly. In the >=11.0.0 case, if you have TCP on one side and UDP on the other * and it should "do the right thing". * - * @attention This function uses g_strdup_printf() rather than the wmem equivalent because the + * @attention This function uses ws_strdup_printf() rather than the wmem equivalent because the * caller (menu_dissector_filter_cb()) uses g_free to free the filter string. * (as of WS 1.12). */ @@ -611,7 +611,7 @@ f5_udp_conv_filter(packet_info *pinfo) address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); if (*src_addr != '\0' && *dst_addr != '\0') { - buf = g_strdup_printf( + buf = ws_strdup_printf( "(ip.addr eq %s and ip.addr eq %s and udp.port eq %d and udp.port eq %d) or" " (f5ethtrailer.peeraddr eq %s and f5ethtrailer.peeraddr eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" @@ -623,7 +623,7 @@ f5_udp_conv_filter(packet_info *pinfo) address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); if (*src_addr != '\0' && *dst_addr != '\0') { - buf = g_strdup_printf( + buf = ws_strdup_printf( "(ipv6.addr eq %s and ipv6.addr eq %s and udp.port eq %d and udp.port eq %d) or" " (f5ethtrailer.peeraddr6 eq %s and f5ethtrailer.peeraddr6 eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 99303be481..619504002f 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -1003,7 +1003,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* /* XXX - add other hardware exception codes as required */ default: show_exception(tvb, pinfo, parent_tree, DissectorError, - g_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); + ws_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); } } #endif @@ -1071,7 +1071,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* /* XXX - add other hardware exception codes as required */ default: show_exception(tvb, pinfo, parent_tree, DissectorError, - g_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); + ws_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode())); } } #endif diff --git a/epan/dissectors/packet-ftdi-mpsse.c b/epan/dissectors/packet-ftdi-mpsse.c index e3f2b51404..838ef2f1b6 100644 --- a/epan/dissectors/packet-ftdi-mpsse.c +++ b/epan/dissectors/packet-ftdi-mpsse.c @@ -485,15 +485,15 @@ static gchar* freq_to_str(gfloat freq) { if (freq < 1e3) { - return g_strdup_printf("%.12g Hz", freq); + return ws_strdup_printf("%.12g Hz", freq); } else if (freq < 1e6) { - return g_strdup_printf("%.12g kHz", freq / 1e3); + return ws_strdup_printf("%.12g kHz", freq / 1e3); } else { - return g_strdup_printf("%.12g MHz", freq / 1e6); + return ws_strdup_printf("%.12g MHz", freq / 1e6); } } diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 382c8aee13..120bd3cf35 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -1839,7 +1839,7 @@ be_cell_id_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off } else { - char *str = g_strdup_printf("%s/RNC-ID (%u)", add_string, value); + char *str = ws_strdup_printf("%s/RNC-ID (%u)", add_string, value); g_strlcpy(add_string, str, string_len); g_free(str); } @@ -1868,7 +1868,7 @@ be_cell_id_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off } else { - char *str = g_strdup_printf("%s/CI (%u)", add_string, value); + char *str = ws_strdup_printf("%s/CI (%u)", add_string, value); g_strlcpy(add_string, str, string_len); g_free(str); } diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index a4d9bf0ae5..bf4384ebf4 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -3712,7 +3712,7 @@ static void gsm_a_stat_init(stat_tap_table_ui* new_stat, const char *table_title if (msg_str) { col_str = g_strdup(msg_str); } else { - col_str = g_strdup_printf("Unknown message %d", i); + col_str = ws_strdup_printf("Unknown message %d", i); } items[IEI_COLUMN].value.uint_value = i; diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index e1d5908ab4..91bf2de2fc 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -24156,7 +24156,7 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat) if (ocs) { col_str = g_strdup(ocs); } else { - col_str = g_strdup_printf("Unknown op code %d", i); + col_str = ws_strdup_printf("Unknown op code %d", i); } items[ID_COLUMN].value.uint_value = i; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 69ae2bae95..faca4a4f83 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -540,7 +540,7 @@ pdcp_uat_fld_ip_chk_cb(void* r _U_, const char* ipaddr, guint len _U_, const voi return TRUE; } - *err = g_strdup_printf("No valid IP address given"); + *err = ws_strdup_printf("No valid IP address given"); return FALSE; } @@ -564,7 +564,7 @@ pdcp_uat_fld_teid_chk_cb(void* r _U_, const char* teid, guint len _U_, const voi } } - *err = g_strdup_printf("No valid TEID given"); + *err = ws_strdup_printf("No valid TEID given"); return FALSE; } @@ -598,7 +598,7 @@ static gboolean pdcp_lte_update_cb(void *r, char **err) rec->teid_wildcard = FALSE; } else { if (err) - *err = g_strdup_printf("No valid TEID given"); + *err = ws_strdup_printf("No valid TEID given"); return FALSE; } @@ -609,7 +609,7 @@ static gboolean pdcp_lte_update_cb(void *r, char **err) alloc_address_wmem(wmem_epan_scope(), &rec->ip_address, AT_IPv4, sizeof(ws_in4_addr), &ip4_addr); } else { if (err) - *err = g_strdup_printf("No valid IP address given"); + *err = ws_strdup_printf("No valid IP address given"); return FALSE; } @@ -689,7 +689,7 @@ static gboolean pdcp_nr_update_cb(void *r, char **err) { rec->teid_wildcard = FALSE; } else { if (err) - *err = g_strdup_printf("No valid TEID given"); + *err = ws_strdup_printf("No valid TEID given"); return FALSE; } @@ -700,7 +700,7 @@ static gboolean pdcp_nr_update_cb(void *r, char **err) { alloc_address_wmem(wmem_epan_scope(), &rec->ip_address, AT_IPv4, sizeof(ws_in4_addr), &ip4_addr); } else { if (err) - *err = g_strdup_printf("No valid IP address given"); + *err = ws_strdup_printf("No valid IP address given"); return FALSE; } diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index a1fd8c6ee6..e927bf9f44 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -198,7 +198,7 @@ header_fields_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->header_name); if (c) { - *err = g_strdup_printf("Header name can't contain '%c'", c); + *err = ws_strdup_printf("Header name can't contain '%c'", c); return FALSE; } @@ -2891,7 +2891,7 @@ header_fields_post_update_cb(void) dynamic_hf[i].p_id = hf_id; dynamic_hf[i].hfinfo.name = header_name; - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("http.header.%s", header_name); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("http.header.%s", header_name); dynamic_hf[i].hfinfo.type = FT_STRING; dynamic_hf[i].hfinfo.display = BASE_NONE; dynamic_hf[i].hfinfo.strings = NULL; diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index a57cec0791..98bda390fa 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -576,7 +576,7 @@ header_fields_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->header_name); if (c) { - *err = g_strdup_printf("Header name can't contain '%c'", c); + *err = ws_strdup_printf("Header name can't contain '%c'", c); return FALSE; } @@ -584,7 +584,7 @@ header_fields_update_cb(void *r, char **err) if (header_fields_hash != NULL) { const gint *entry = (const gint *) g_hash_table_lookup(header_fields_hash, rec->header_name); if (entry != NULL) { - *err = g_strdup_printf("This header field is already defined in UAT or it is a static header field"); + *err = ws_strdup_printf("This header field is already defined in UAT or it is a static header field"); return FALSE; } } @@ -1101,7 +1101,7 @@ http2_init_protocol(void) hf_uat[i].p_id = hf_id; hf_uat[i].hfinfo.name = header_name; - hf_uat[i].hfinfo.abbrev = g_strdup_printf("http2.headers.%s", header_name); + hf_uat[i].hfinfo.abbrev = ws_strdup_printf("http2.headers.%s", header_name); switch(header_fields[i].header_type) { case val_uint64: hf_uat[i].hfinfo.type = FT_UINT64; @@ -2314,7 +2314,7 @@ http2_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo, guint *str *stream = tcpd->stream; *sub_stream = h2session->current_stream_id; - return g_strdup_printf("tcp.stream eq %u and http2.streamid eq %u", tcpd->stream, h2session->current_stream_id); + return ws_strdup_printf("tcp.stream eq %u and http2.streamid eq %u", tcpd->stream, h2session->current_stream_id); } return NULL; @@ -2395,7 +2395,7 @@ http2_get_stream_id_ge(guint streamid, guint sub_stream_id, guint *sub_stream_id static gchar* http2_follow_index_filter(guint stream, guint sub_stream) { - return g_strdup_printf("tcp.stream eq %u and http2.streamid eq %u", stream, sub_stream); + return ws_strdup_printf("tcp.stream eq %u and http2.streamid eq %u", stream, sub_stream); } static tap_packet_status diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 91df22bc95..442a1e9049 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -322,7 +322,7 @@ static gboolean ieee802154_key_update_cb(void *r, char **err) if (bytes->len < IEEE802154_CIPHER_SIZE) { - *err = g_strdup_printf("Key must be at least %d bytes", IEEE802154_CIPHER_SIZE); + *err = ws_strdup_printf("Key must be at least %d bytes", IEEE802154_CIPHER_SIZE); g_byte_array_free(bytes, TRUE); return FALSE; } @@ -5609,7 +5609,7 @@ static gboolean ieee802154_filter_valid(packet_info *pinfo) static gchar* ieee802154_build_filter(packet_info *pinfo) { - return g_strdup_printf("wpan.%s eq %s and wpan.%s eq %s", + return ws_strdup_printf("wpan.%s eq %s and wpan.%s eq %s", (pinfo->dl_src.type == ieee802_15_4_short_address_type) ? "addr16" : "addr64", address_to_str(pinfo->pool, &pinfo->dl_src), (pinfo->dl_dst.type == ieee802_15_4_short_address_type) ? "addr16" : "addr64", diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 9a2de8ef4b..4ab9ec9377 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -169,14 +169,14 @@ imf_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const /* Only include the string inside of the "<>" brackets. If there is nothing between the two brackets use the sender_data string */ if(start && stop && stop > start && (stop - start) > 2){ - entry->hostname = g_strdup_printf("%.*s", (int) (stop - start - 1), start + 1); + entry->hostname = ws_strdup_printf("%.*s", (int) (stop - start - 1), start + 1); } else { entry->hostname = g_strdup(eo_info->sender_data); } entry->pkt_num = pinfo->num; entry->content_type = g_strdup("EML file"); - entry->filename = g_strdup_printf("%s.eml", eo_info->subject_data); + entry->filename = ws_strdup_printf("%s.eml", eo_info->subject_data); entry->payload_len = eo_info->payload_len; entry->payload_data = (guint8 *)g_memdup2(eo_info->payload_data, eo_info->payload_len); @@ -339,7 +339,7 @@ header_fields_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->header_name); if (c) { - *err = g_strdup_printf("Header name can't contain '%c'", c); + *err = ws_strdup_printf("Header name can't contain '%c'", c); return FALSE; } @@ -983,7 +983,7 @@ header_fields_post_update_cb (void) dynamic_hf[i].p_id = hf_id; dynamic_hf[i].hfinfo.name = header_name; - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf ("imf.header.%s", header_name); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf ("imf.header.%s", header_name); dynamic_hf[i].hfinfo.type = FT_STRING; dynamic_hf[i].hfinfo.display = BASE_NONE; dynamic_hf[i].hfinfo.strings = NULL; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index afb9c748f0..09f4af6975 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -545,7 +545,7 @@ ip_filter_valid(packet_info *pinfo) static gchar* ip_build_filter(packet_info *pinfo) { - return g_strdup_printf("ip.addr eq %s and ip.addr eq %s", + return ws_strdup_printf("ip.addr eq %s and ip.addr eq %s", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst)); } diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index e4bb40480e..f229f8b1c3 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -320,7 +320,7 @@ compute_ascii_key(gchar **ascii_key, const gchar *key, char **err) { g_free(*ascii_key); *ascii_key = NULL; - *err = g_strdup_printf("Key %s begins with an invalid hex char (%c)", key, key[i]); + *err = ws_strdup_printf("Key %s begins with an invalid hex char (%c)", key, key[i]); return -1; /* not a valid hex digit */ } (*ascii_key)[j] = (guchar)hex_digit; @@ -345,7 +345,7 @@ compute_ascii_key(gchar **ascii_key, const gchar *key, char **err) { g_free(*ascii_key); *ascii_key = NULL; - *err = g_strdup_printf("Key %s has an invalid hex char (%c)", + *err = ws_strdup_printf("Key %s has an invalid hex char (%c)", key, key[i-1]); return -1; /* not a valid hex digit */ } @@ -356,7 +356,7 @@ compute_ascii_key(gchar **ascii_key, const gchar *key, char **err) { g_free(*ascii_key); *ascii_key = NULL; - *err = g_strdup_printf("Key %s has an invalid hex char (%c)", key, key[i-1]); + *err = ws_strdup_printf("Key %s has an invalid hex char (%c)", key, key[i-1]); return -1; /* not a valid hex digit */ } key_byte |= (guchar)hex_digit; diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 6411ab504e..77dfd6b42b 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -564,7 +564,7 @@ ipv6_filter_valid(packet_info *pinfo) static gchar* ipv6_build_filter(packet_info *pinfo) { - return g_strdup_printf("ipv6.addr eq %s and ipv6.addr eq %s", + return ws_strdup_printf("ipv6.addr eq %s and ipv6.addr eq %s", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst)); } diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index a66224a1a7..2aae7c0e14 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -6292,7 +6292,7 @@ static gboolean ikev1_uat_data_update_cb(void* p, char** err) { ikev1_uat_data_key_t *ud = (ikev1_uat_data_key_t *)p; if (ud->icookie_len != COOKIE_SIZE) { - *err = g_strdup_printf("Length of Initiator's COOKIE must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2); + *err = ws_strdup_printf("Length of Initiator's COOKIE must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2); return FALSE; } @@ -6302,7 +6302,7 @@ static gboolean ikev1_uat_data_update_cb(void* p, char** err) { } if (ud->key_len > MAX_KEY_SIZE) { - *err = g_strdup_printf("Length of Encryption key limited to %d octets (%d hex characters).", MAX_KEY_SIZE, MAX_KEY_SIZE * 2); + *err = ws_strdup_printf("Length of Encryption key limited to %d octets (%d hex characters).", MAX_KEY_SIZE, MAX_KEY_SIZE * 2); return FALSE; } @@ -6377,12 +6377,12 @@ static gboolean ikev2_uat_data_update_cb(void* p, char** err) { ikev2_uat_data_t *ud = (ikev2_uat_data_t *)p; if (ud->key.spii_len != COOKIE_SIZE) { - *err = g_strdup_printf("Length of Initiator's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2); + *err = ws_strdup_printf("Length of Initiator's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2); return FALSE; } if (ud->key.spir_len != COOKIE_SIZE) { - *err = g_strdup_printf("Length of Responder's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2); + *err = ws_strdup_printf("Length of Responder's SPI must be %d octets (%d hex characters).", COOKIE_SIZE, COOKIE_SIZE * 2); return FALSE; } @@ -6395,31 +6395,31 @@ static gboolean ikev2_uat_data_update_cb(void* p, char** err) { } if (ud->encr_spec->icv_len && ud->auth_spec->number != IKEV2_AUTH_NONE) { - *err = g_strdup_printf("Selected encryption_algorithm %s requires selecting NONE integrity algorithm.", + *err = ws_strdup_printf("Selected encryption_algorithm %s requires selecting NONE integrity algorithm.", val_to_str(ud->encr_spec->number, vs_ikev2_encr_algs, "other-%d")); return FALSE; } if (ud->sk_ei_len != ud->encr_spec->key_len) { - *err = g_strdup_printf("Length of SK_ei (%u octets) does not match the key length (%u octets) of the selected encryption algorithm.", + *err = ws_strdup_printf("Length of SK_ei (%u octets) does not match the key length (%u octets) of the selected encryption algorithm.", ud->sk_ei_len, ud->encr_spec->key_len); return FALSE; } if (ud->sk_er_len != ud->encr_spec->key_len) { - *err = g_strdup_printf("Length of SK_er (%u octets) does not match the key length (%u octets) of the selected encryption algorithm.", + *err = ws_strdup_printf("Length of SK_er (%u octets) does not match the key length (%u octets) of the selected encryption algorithm.", ud->sk_er_len, ud->encr_spec->key_len); return FALSE; } if (ud->sk_ai_len != ud->auth_spec->key_len) { - *err = g_strdup_printf("Length of SK_ai (%u octets) does not match the key length (%u octets) of the selected integrity algorithm.", + *err = ws_strdup_printf("Length of SK_ai (%u octets) does not match the key length (%u octets) of the selected integrity algorithm.", ud->sk_ai_len, ud->auth_spec->key_len); return FALSE; } if (ud->sk_ar_len != ud->auth_spec->key_len) { - *err = g_strdup_printf("Length of SK_ar (%u octets) does not match the key length (%u octets) of the selected integrity algorithm.", + *err = ws_strdup_printf("Length of SK_ar (%u octets) does not match the key length (%u octets) of the selected integrity algorithm.", ud->sk_ar_len, ud->auth_spec->key_len); return FALSE; } diff --git a/epan/dissectors/packet-iso15765.c b/epan/dissectors/packet-iso15765.c index fbbf5ffbe0..db1cde6e0a 100644 --- a/epan/dissectors/packet-iso15765.c +++ b/epan/dissectors/packet-iso15765.c @@ -249,44 +249,44 @@ update_config_can_addr_mappings(void *r, char **err) { config_can_addr_mapping_t *rec = (config_can_addr_mapping_t *)r; if (rec->source_addr_mask == 0 && rec->target_addr_mask == 0 && rec->ecu_addr_mask == 0) { - *err = g_strdup_printf("You need to define the ECU Mask OR Source Mask/Target Mask!"); + *err = ws_strdup_printf("You need to define the ECU Mask OR Source Mask/Target Mask!"); return FALSE; } if ((rec->source_addr_mask != 0 || rec->target_addr_mask != 0) && rec->ecu_addr_mask != 0) { - *err = g_strdup_printf("You can only use Source Address Mask/Target Address Mask OR ECU Address Mask! Not both at the same time!"); + *err = ws_strdup_printf("You can only use Source Address Mask/Target Address Mask OR ECU Address Mask! Not both at the same time!"); return FALSE; } if ((rec->source_addr_mask == 0 || rec->target_addr_mask == 0) && rec->ecu_addr_mask == 0) { - *err = g_strdup_printf("You can only use Source Address Mask and Target Address Mask in combination!"); + *err = ws_strdup_printf("You can only use Source Address Mask and Target Address Mask in combination!"); return FALSE; } if (rec->extended_address) { if ((rec->source_addr_mask & ~CAN_EFF_MASK) != 0) { - *err = g_strdup_printf("Source Address Mask covering bits not allowed for extended IDs (29bit)!"); + *err = ws_strdup_printf("Source Address Mask covering bits not allowed for extended IDs (29bit)!"); return FALSE; } if ((rec->target_addr_mask & ~CAN_EFF_MASK) != 0) { - *err = g_strdup_printf("Target Address Mask covering bits not allowed for extended IDs (29bit)!"); + *err = ws_strdup_printf("Target Address Mask covering bits not allowed for extended IDs (29bit)!"); return FALSE; } if ((rec->ecu_addr_mask & ~CAN_EFF_MASK) != 0) { - *err = g_strdup_printf("ECU Address Mask covering bits not allowed for extended IDs (29bit)!"); + *err = ws_strdup_printf("ECU Address Mask covering bits not allowed for extended IDs (29bit)!"); return FALSE; } } else { if ((rec->source_addr_mask & ~CAN_SFF_MASK) != 0) { - *err = g_strdup_printf("Source Address Mask covering bits not allowed for standard IDs (11bit)!"); + *err = ws_strdup_printf("Source Address Mask covering bits not allowed for standard IDs (11bit)!"); return FALSE; } if ((rec->target_addr_mask & ~CAN_SFF_MASK) != 0) { - *err = g_strdup_printf("Target Address Mask covering bits not allowed for standard IDs (11bit)!"); + *err = ws_strdup_printf("Target Address Mask covering bits not allowed for standard IDs (11bit)!"); return FALSE; } if ((rec->ecu_addr_mask & ~CAN_SFF_MASK) != 0) { - *err = g_strdup_printf("ECU Address Mask covering bits not allowed for standard IDs (11bit)!"); + *err = ws_strdup_printf("ECU Address Mask covering bits not allowed for standard IDs (11bit)!"); return FALSE; } } diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 938cbf28f4..4f35b609fc 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -307,7 +307,7 @@ k12_update_cb(void* r, char** err) if ( ! (h->handles[i] = find_dissector(protos[i])) ) { h->handles[i] = data_handle; h->handles[i+1] = NULL; - *err = g_strdup_printf("Could not find dissector for: '%s'",protos[i]); + *err = ws_strdup_printf("Could not find dissector for: '%s'",protos[i]); g_strfreev(protos); return FALSE; } @@ -374,7 +374,7 @@ protos_chk_cb(void* r _U_, const char* p, guint len, const void* u1 _U_, const v for (i = 0; i < num_protos; i++) { if (!find_dissector(protos[i])) { - *err = g_strdup_printf("Could not find dissector for: '%s'",protos[i]); + *err = ws_strdup_printf("Could not find dissector for: '%s'",protos[i]); wmem_free(NULL, line); g_strfreev(protos); return FALSE; diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 50c062437b..f987aa35af 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -6150,24 +6150,24 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _ if (stream_info->description == NULL) { - sai->frame_label = g_strdup_printf("(%" PRIu32 ")", stream_info->sqn); + sai->frame_label = ws_strdup_printf("(%" PRIu32 ")", stream_info->sqn); } else { - sai->frame_label = g_strdup_printf("%s (%" PRIu32 ")", stream_info->description, stream_info->sqn); + sai->frame_label = ws_strdup_printf("%s (%" PRIu32 ")", stream_info->description, stream_info->sqn); } if (epa.type == lbm_uim_instance_stream) { ctxinst1 = bytes_to_str(pinfo->pool, epa.stream_info.ctxinst.ctxinst, sizeof(epa.stream_info.ctxinst.ctxinst)); ctxinst2 = bytes_to_str(pinfo->pool, epb.stream_info.ctxinst.ctxinst, sizeof(epb.stream_info.ctxinst.ctxinst)); - sai->comment = g_strdup_printf("%s <-> %s [%" PRIu64 "]", + sai->comment = ws_strdup_printf("%s <-> %s [%" PRIu64 "]", ctxinst1, ctxinst2, stream_info->channel); } else { - sai->comment = g_strdup_printf("%" PRIu32 ":%s:%" PRIu16 " <-> %" PRIu32 ":%s:%" PRIu16 " [%" PRIu64 "]", + sai->comment = ws_strdup_printf("%" PRIu32 ":%s:%" PRIu16 " <-> %" PRIu32 ":%s:%" PRIu16 " [%" PRIu64 "]", epa.stream_info.dest.domain, address_to_str(pinfo->pool, &(epa.stream_info.dest.addr)), epa.stream_info.dest.port, diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 8ec97cb899..0b189d30ff 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -697,7 +697,7 @@ attribute_types_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->attribute_type); if (c) { - *err = g_strdup_printf("Attribute type can't contain '%c'", c); + *err = ws_strdup_printf("Attribute type can't contain '%c'", c); return FALSE; } @@ -790,7 +790,7 @@ attribute_types_post_update_cb(void) dynamic_hf[i].p_id = hf_id; dynamic_hf[i].hfinfo.name = attribute_type; - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("ldap.AttributeValue.%s", attribute_type); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("ldap.AttributeValue.%s", attribute_type); dynamic_hf[i].hfinfo.type = FT_STRING; dynamic_hf[i].hfinfo.display = BASE_NONE; dynamic_hf[i].hfinfo.strings = NULL; diff --git a/epan/dissectors/packet-lin.c b/epan/dissectors/packet-lin.c index cfc23b5573..2ddc2b02d4 100644 --- a/epan/dissectors/packet-lin.c +++ b/epan/dissectors/packet-lin.c @@ -144,13 +144,13 @@ update_interface_config(void *r, char **err) { interface_config_t *rec = (interface_config_t *)r; if (rec->interface_id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", + *err = ws_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", rec->interface_id, rec->interface_name); return FALSE; } if (rec->bus_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit bus identifiers (ID: %i Name: %s Bus-ID: %i)", + *err = ws_strdup_printf("We currently only support 16 bit bus identifiers (ID: %i Name: %s Bus-ID: %i)", rec->interface_id, rec->interface_name, rec->bus_id); return FALSE; } diff --git a/epan/dissectors/packet-lwm2mtlv.c b/epan/dissectors/packet-lwm2mtlv.c index 133a809ac8..a378601f33 100644 --- a/epan/dissectors/packet-lwm2mtlv.c +++ b/epan/dissectors/packet-lwm2mtlv.c @@ -383,7 +383,7 @@ static gboolean lwm2m_resource_update_cb(void *record, char **error) /* Check for invalid characters (to avoid asserting out when registering the field). */ c = proto_check_field_name(rec->field_name); if (c) { - *error = g_strdup_printf("Resource Name can't contain '%c'", c); + *error = ws_strdup_printf("Resource Name can't contain '%c'", c); return FALSE; } @@ -437,7 +437,7 @@ static void lwm2m_add_resource(lwm2m_resource_t *resource, hf_register_info *hf, hf->p_id = hf_id; hf->hfinfo.name = g_strdup(resource->name); - hf->hfinfo.abbrev = g_strdup_printf("lwm2mtlv.resource.%s", resource_abbrev); + hf->hfinfo.abbrev = ws_strdup_printf("lwm2mtlv.resource.%s", resource_abbrev); g_free (resource_abbrev); switch (resource->data_type) { diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index a8142ba760..24d25a62bc 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -327,7 +327,7 @@ megacostat_filtercheck(const char *opt_arg _U_, const char **filter _U_, char** } if (!prefs_get_bool_value(megaco_ctx_track, pref_current) || !prefs_get_bool_value(h248_ctx_track, pref_current)) { - *err = g_strdup_printf("Track Context option at Protocols -> MEGACO and Protocols -> H248 preferences\n" + *err = ws_strdup_printf("Track Context option at Protocols -> MEGACO and Protocols -> H248 preferences\n" "has to be set to true to enable measurement of service response times.\n"); } } diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index c8503e3780..6b9479fdf2 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -660,7 +660,7 @@ static gboolean mqtt_message_decode_update_cb(void *record, char **error) u->topic_regex = g_regex_new(u->topic_pattern, (GRegexCompileFlags) G_REGEX_OPTIMIZE, (GRegexMatchFlags) 0, NULL); if (!u->topic_regex) { - *error = g_strdup_printf("Invalid regex: %s", u->topic_pattern); + *error = ws_strdup_printf("Invalid regex: %s", u->topic_pattern); return FALSE; } } diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index 168ff49168..33c4920184 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -2972,7 +2972,7 @@ static void get_name_from_fullpropspec(struct CFullPropSpec *v, char *out, int b } else if (v->kind == PRSPEC_PROPID) { snprintf(dest, bufsize, "%s 0x%08x", guid_str, v->u.propid); } else { - char *str = g_strdup_printf("%s <INVALID>", dest); + char *str = ws_strdup_printf("%s <INVALID>", dest); g_strlcpy(dest, str, bufsize); g_free(str); } diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index f17a84d04c..db0053b54e 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -1142,7 +1142,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void recognized_packet = wmem_list_frame_next(recognized_packet); } /* insert how many packets were found */ - col_info_str = g_strdup_printf("%s: %u Packet%s%s%s", + col_info_str = ws_strdup_printf("%s: %u Packet%s%s%s", "MTP2", wmem_list_count(result->found_packets), (wmem_list_count(result->found_packets) > 1 @@ -1150,7 +1150,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void :"" ), (was_unaligned_packet - ?g_strdup_printf(" [Unaligned Packet%s]", (wmem_list_count(result->found_packets)>1 + ?ws_strdup_printf(" [Unaligned Packet%s]", (wmem_list_count(result->found_packets)>1 ?"s" :"")) :"" @@ -1169,7 +1169,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void && frag_msg_before_fh) { col_add_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); - col_info_str = g_strdup_printf("[MTP2 Reassembled in: %u]", frag_msg_before_fh->reassembled_in); + col_info_str = ws_strdup_printf("[MTP2 Reassembled in: %u]", frag_msg_before_fh->reassembled_in); col_add_str(pinfo->cinfo, COL_INFO, col_info_str); g_free(col_info_str); } else { diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 8588aa9537..e1cc53948a 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -924,7 +924,7 @@ mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, if (sis) { col_str = g_strdup(sis); } else { - col_str = g_strdup_printf("Unknown service indicator %d", m3tr->mtp3_si_code); + col_str = ws_strdup_printf("Unknown service indicator %d", m3tr->mtp3_si_code); } item_data = stat_tap_get_field_data(table, element, SI_COLUMN); diff --git a/epan/dissectors/packet-oscore.c b/epan/dissectors/packet-oscore.c index ccfcf78470..a0b060c653 100644 --- a/epan/dissectors/packet-oscore.c +++ b/epan/dissectors/packet-oscore.c @@ -202,7 +202,7 @@ static gboolean oscore_context_update_cb(void *r, char **err) { } if (bytes->len > OSCORE_KID_MAX_LEN) { - *err = g_strdup_printf("Should be %u bytes or less.", OSCORE_KID_MAX_LEN); + *err = ws_strdup_printf("Should be %u bytes or less.", OSCORE_KID_MAX_LEN); g_byte_array_free(bytes, TRUE); return FALSE; } @@ -214,7 +214,7 @@ static gboolean oscore_context_update_cb(void *r, char **err) { } if (bytes->len > OSCORE_KID_MAX_LEN) { - *err = g_strdup_printf("Should be %u bytes or less.", OSCORE_KID_MAX_LEN); + *err = ws_strdup_printf("Should be %u bytes or less.", OSCORE_KID_MAX_LEN); g_byte_array_free(bytes, TRUE); return FALSE; } @@ -226,7 +226,7 @@ static gboolean oscore_context_update_cb(void *r, char **err) { } if (bytes->len > OSCORE_KID_CONTEXT_MAX_LEN) { - *err = g_strdup_printf("Should be %u bytes or less.", OSCORE_KID_CONTEXT_MAX_LEN); + *err = ws_strdup_printf("Should be %u bytes or less.", OSCORE_KID_CONTEXT_MAX_LEN); g_byte_array_free(bytes, TRUE); return FALSE; } diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index b32930dbf1..ab0acb2cba 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -218,7 +218,7 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str /* Can't be valid if not long enough. */ if (length < 32) { if (length > 0) { - *error = g_strdup_printf("PDCP LTE: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given", + *error = ws_strdup_printf("PDCP LTE: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given", raw_string, length); } @@ -240,18 +240,18 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str checked_string[written++] = c; } else { - *error = g_strdup_printf("PDCP-LTE: Invalid char '%c' given in key", c); + *error = ws_strdup_printf("PDCP-LTE: Invalid char '%c' given in key", c); return FALSE; } } /* Must have found exactly 32 hex ascii chars for 16-byte key */ if (n<length) { - *error = g_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string); + *error = ws_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string); return FALSE; } if (written != 32) { - *error = g_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written); + *error = ws_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written); return FALSE; } else { diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c index 024ca98cd5..68e27f4269 100644 --- a/epan/dissectors/packet-pdcp-nr.c +++ b/epan/dissectors/packet-pdcp-nr.c @@ -197,7 +197,7 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str /* Can't be valid if not long enough. */ if (length < 32) { if (length > 0) { - *error = g_strdup_printf("PDCP NR: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given", + *error = ws_strdup_printf("PDCP NR: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given", raw_string, length); } return FALSE; @@ -218,18 +218,18 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str checked_string[written++] = c; } else { - *error = g_strdup_printf("PDCP-NR: Invalid char '%c' given in key", c); + *error = ws_strdup_printf("PDCP-NR: Invalid char '%c' given in key", c); return FALSE; } } /* Must have found exactly 32 hex ascii chars for 16-byte key */ if (n<length) { - *error = g_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string); + *error = ws_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string); return FALSE; } if (written != 32) { - *error = g_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written); + *error = ws_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written); return FALSE; } else { diff --git a/epan/dissectors/packet-protobuf.c b/epan/dissectors/packet-protobuf.c index 3c762ef385..6ec4f59893 100644 --- a/epan/dissectors/packet-protobuf.c +++ b/epan/dissectors/packet-protobuf.c @@ -1571,7 +1571,7 @@ collect_fields(const PbwDescriptor* message, void* userdata) hf->p_id = g_new(gint, 1); *(hf->p_id) = -1; hf->hfinfo.name = g_strdup(pbw_Descriptor_name(message)); - hf->hfinfo.abbrev = g_strdup_printf("pbm.%s", pbw_Descriptor_full_name(message)); + hf->hfinfo.abbrev = ws_strdup_printf("pbm.%s", pbw_Descriptor_full_name(message)); hf->hfinfo.type = FT_BYTES; hf->hfinfo.display = BASE_NONE; wmem_list_append(hf_list, hf); @@ -1590,7 +1590,7 @@ collect_fields(const PbwDescriptor* message, void* userdata) *(hf->p_id) = -1; hf->hfinfo.name = g_strdup(pbw_FieldDescriptor_name(field_desc)); - hf->hfinfo.abbrev = g_strdup_printf("pbf.%s", pbw_FieldDescriptor_full_name(field_desc)); + hf->hfinfo.abbrev = ws_strdup_printf("pbf.%s", pbw_FieldDescriptor_full_name(field_desc)); switch (field_type) { case PROTOBUF_TYPE_DOUBLE: hf->hfinfo.type = FT_DOUBLE; diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index 014f327c15..ad4aa70fbf 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -3970,7 +3970,7 @@ quic_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo, guint *stre if (s) { *stream = conn->number; *sub_stream = (guint)s->stream_id; - return g_strdup_printf("quic.connection.number eq %u and quic.stream.stream_id eq %u", conn->number, *sub_stream); + return ws_strdup_printf("quic.connection.number eq %u and quic.stream.stream_id eq %u", conn->number, *sub_stream); } } } @@ -3981,7 +3981,7 @@ quic_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo, guint *stre static gchar * quic_follow_index_filter(guint stream, guint sub_stream) { - return g_strdup_printf("quic.connection.number eq %u and quic.stream.stream_id eq %u", stream, sub_stream); + return ws_strdup_printf("quic.connection.number eq %u and quic.stream.stream_id eq %u", stream, sub_stream); } static gchar * diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index efa16d2586..d437bec9e1 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -2508,7 +2508,7 @@ radius_register_avp_dissector(guint32 vendor_id, guint32 _attribute_id, radius_a if (!vendor) { vendor = g_new(radius_vendor_info_t, 1); - vendor->name = g_strdup_printf("%s-%u", + vendor->name = ws_strdup_printf("%s-%u", enterprises_lookup(vendor_id, "Unknown"), vendor_id); vendor->code = vendor_id; @@ -2534,7 +2534,7 @@ radius_register_avp_dissector(guint32 vendor_id, guint32 _attribute_id, radius_a if (!dictionary_entry) { dictionary_entry = g_new(radius_attr_info_t, 1); - dictionary_entry->name = g_strdup_printf("Unknown-Attribute-%u", attribute_id.value); + dictionary_entry->name = ws_strdup_printf("Unknown-Attribute-%u", attribute_id.value); dictionary_entry->code = attribute_id; dictionary_entry->encrypt = 0; dictionary_entry->type = NULL; diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 175670ea60..a6ebca274d 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -422,7 +422,7 @@ rpcstat_param(register_srt_t* srt, const char* opt_arg, char** err) tap_data->num_procedures = rpc_max_proc+1; if (rpc_min_proc == -1) { - *err = g_strdup_printf("Program:%u version:%u isn't supported", rpc_program, rpc_version); + *err = ws_strdup_printf("Program:%u version:%u isn't supported", rpc_program, rpc_version); } } else diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 16fcf78304..bea387cef3 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -471,7 +471,7 @@ sctp_chunk_type_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->type_name); if (c) { - *err = g_strdup_printf("Header name can't contain '%c'", c); + *err = ws_strdup_printf("Header name can't contain '%c'", c); return FALSE; } diff --git a/epan/dissectors/packet-signal-pdu.c b/epan/dissectors/packet-signal-pdu.c index 027187da43..85e098a788 100644 --- a/epan/dissectors/packet-signal-pdu.c +++ b/epan/dissectors/packet-signal-pdu.c @@ -433,7 +433,7 @@ update_generic_one_identifier_32bit(void *r, char **err) { generic_one_id_string_t *rec = (generic_one_id_string_t *)r; if (rec->id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); return FALSE; } @@ -445,11 +445,11 @@ update_generic_one_identifier_32bit(void *r, char **err) { guchar c = proto_check_field_name(rec->name); if (c) { if (c == '.') { - *err = g_strdup_printf("Name contains illegal chars '.' (ID: 0x%08x)", rec->id); + *err = ws_strdup_printf("Name contains illegal chars '.' (ID: 0x%08x)", rec->id); } else if (g_ascii_isprint(c)) { - *err = g_strdup_printf("Name contains illegal chars '%c' (ID: 0x%08x)", c, rec->id); + *err = ws_strdup_printf("Name contains illegal chars '%c' (ID: 0x%08x)", c, rec->id); } else { - *err = g_strdup_printf("Name contains invalid byte \\%03o (ID: 0x%08x)", c, rec->id); + *err = ws_strdup_printf("Name contains invalid byte \\%03o (ID: 0x%08x)", c, rec->id); } return FALSE; } @@ -579,66 +579,66 @@ update_spdu_signal_list(void *r, char **err) { spdu_signal_list_uat_t *rec = (spdu_signal_list_uat_t *)r; if (rec->pos >= 0xffff) { - *err = g_strdup_printf("Position too big"); + *err = ws_strdup_printf("Position too big"); return FALSE; } if (rec->num_of_params >= 0xffff) { - *err = g_strdup_printf("Number of Parameters too big"); + *err = ws_strdup_printf("Number of Parameters too big"); return FALSE; } if (rec->pos >= rec->num_of_params) { - *err = g_strdup_printf("Position >= Number of Parameters"); + *err = ws_strdup_printf("Position >= Number of Parameters"); return FALSE; } if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->filter_string == NULL || rec->filter_string[0] == 0) { - *err = g_strdup_printf("Filter String cannot be empty"); + *err = ws_strdup_printf("Filter String cannot be empty"); return FALSE; } c = proto_check_field_name(rec->filter_string); if (c) { if (c == '.') { - *err = g_strdup_printf("Filter String contains illegal chars '.' (ID: 0x%08x)", rec->id); + *err = ws_strdup_printf("Filter String contains illegal chars '.' (ID: 0x%08x)", rec->id); } else if (g_ascii_isprint(c)) { - *err = g_strdup_printf("Filter String contains illegal chars '%c' (ID: 0x%08x)", c, rec->id); + *err = ws_strdup_printf("Filter String contains illegal chars '%c' (ID: 0x%08x)", c, rec->id); } else { - *err = g_strdup_printf("Filter String contains invalid byte \\%03o (ID: 0x%08x)", c, rec->id); + *err = ws_strdup_printf("Filter String contains invalid byte \\%03o (ID: 0x%08x)", c, rec->id); } return FALSE; } if (g_strcmp0(rec->data_type, "uint") != 0 && g_strcmp0(rec->data_type, "int") != 0) { - *err = g_strdup_printf("Currently only uint and int supported!"); + *err = ws_strdup_printf("Currently only uint and int supported!"); return FALSE; } if (g_strcmp0(rec->data_type, "int") == 0 && (rec->bitlength_base_type != rec->bitlength_encoded_type)) { - *err = g_strdup_printf("signed ints (int) only support in non-shortened length"); + *err = ws_strdup_printf("signed ints (int) only support in non-shortened length"); return FALSE; } if (g_strcmp0(rec->data_type, "int") == 0 && (rec->bitlength_encoded_type != 8) && (rec->bitlength_encoded_type != 16) && (rec->bitlength_encoded_type != 32) && (rec->bitlength_encoded_type != 64)) { - *err = g_strdup_printf("signed ints (int) are only supported in 8, 16, 32, or 64 bit."); + *err = ws_strdup_printf("signed ints (int) are only supported in 8, 16, 32, or 64 bit."); return FALSE; } d = g_ascii_strtod(rec->offset, &tmp); if (!(d == d)) { - *err = g_strdup_printf("Offset not a double!"); + *err = ws_strdup_printf("Offset not a double!"); return FALSE; } d = g_ascii_strtod(rec->scaler, &tmp); if (!(d == d)) { - *err = g_strdup_printf("Scaler not a double!"); + *err = ws_strdup_printf("Scaler not a double!"); return FALSE; } @@ -700,11 +700,11 @@ create_hf_entry(guint i, guint32 id, guint32 pos, gchar *name, gchar *filter_str dynamic_hf[i].hfinfo.bitmask = 0x0; if (raw) { - dynamic_hf[i].hfinfo.name = g_strdup_printf("%s_raw", name); - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("%s.%s_raw", SPDU_NAME_FILTER, filter_string); + dynamic_hf[i].hfinfo.name = ws_strdup_printf("%s_raw", name); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("%s.%s_raw", SPDU_NAME_FILTER, filter_string); } else { dynamic_hf[i].hfinfo.name = g_strdup(name); - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("%s.%s", SPDU_NAME_FILTER, filter_string); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("%s.%s", SPDU_NAME_FILTER, filter_string); } dynamic_hf[i].hfinfo.bitmask = 0; dynamic_hf[i].hfinfo.blurb = NULL; @@ -875,17 +875,17 @@ update_spdu_signal_value_name(void *r, char **err) { spdu_signal_value_name_uat_t *rec = (spdu_signal_value_name_uat_t *)r; if (rec->value_name == NULL || rec->value_name[0] == 0) { - *err = g_strdup_printf("Value Name cannot be empty"); + *err = ws_strdup_printf("Value Name cannot be empty"); return FALSE; } if (rec->value_end < rec->value_start) { - *err = g_strdup_printf("Value Range is defined backwards (end < start)!"); + *err = ws_strdup_printf("Value Range is defined backwards (end < start)!"); return FALSE; } if (rec->pos >= 0xffff) { - *err = g_strdup_printf("Position too big"); + *err = ws_strdup_printf("Position too big"); return FALSE; } @@ -1015,24 +1015,24 @@ update_spdu_someip_mapping(void *r, char **err) { spdu_someip_mapping_uat_t *rec = (spdu_someip_mapping_uat_t *)r; if (rec->service_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit SOME/IP Service IDs (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", + *err = ws_strdup_printf("We currently only support 16 bit SOME/IP Service IDs (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", rec->service_id, rec->method_id, rec->message_type, rec->major_version); return FALSE; } if (rec->method_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit SOME/IP Method IDs (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", + *err = ws_strdup_printf("We currently only support 16 bit SOME/IP Method IDs (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", rec->service_id, rec->method_id, rec->message_type, rec->major_version); return FALSE; } if (rec->major_version > 0xff) { - *err = g_strdup_printf("We currently only support 8 bit SOME/IP major versions (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", + *err = ws_strdup_printf("We currently only support 8 bit SOME/IP major versions (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", rec->service_id, rec->method_id, rec->message_type, rec->major_version); } if (rec->message_type > 0xff) { - *err = g_strdup_printf("We currently only support 8 bit SOME/IP message types (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", + *err = ws_strdup_printf("We currently only support 8 bit SOME/IP message types (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)", rec->service_id, rec->method_id, rec->message_type, rec->major_version); } @@ -1170,12 +1170,12 @@ update_spdu_flexray_mapping(void *r, char **err) { spdu_flexray_mapping_uat_t *rec = (spdu_flexray_mapping_uat_t *)r; if (rec->cycle > 0xff) { - *err = g_strdup_printf("We currently only support 8 bit Cycles (Cycle: %i Frame ID: %i)", rec->cycle, rec->flexray_id); + *err = ws_strdup_printf("We currently only support 8 bit Cycles (Cycle: %i Frame ID: %i)", rec->cycle, rec->flexray_id); return FALSE; } if (rec->flexray_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit Frame IDs (Cycle: %i Frame ID: %i)", rec->cycle, rec->flexray_id); + *err = ws_strdup_printf("We currently only support 16 bit Frame IDs (Cycle: %i Frame ID: %i)", rec->cycle, rec->flexray_id); return FALSE; } @@ -1243,12 +1243,12 @@ update_spdu_lin_mapping(void *r, char **err) { spdu_lin_mapping_uat_t *rec = (spdu_lin_mapping_uat_t *)r; if (rec->frame_id > LIN_ID_MASK) { - *err = g_strdup_printf("LIN Frame IDs are only uint with 6 bits (ID: %i)", rec->frame_id); + *err = ws_strdup_printf("LIN Frame IDs are only uint with 6 bits (ID: %i)", rec->frame_id); return FALSE; } if (rec->bus_id > 0xffff) { - *err = g_strdup_printf("LIN Bus IDs are only uint with 16 bits (ID: 0x%x, Bus ID: 0x%x)", rec->frame_id, rec->bus_id); + *err = ws_strdup_printf("LIN Bus IDs are only uint with 16 bits (ID: 0x%x, Bus ID: 0x%x)", rec->frame_id, rec->bus_id); return FALSE; } @@ -1324,7 +1324,7 @@ update_spdu_pdu_transport_mapping(void *r, char **err) { spdu_pdu_transport_mapping_uat_t *rec = (spdu_pdu_transport_mapping_uat_t *)r; if (rec->pdu_id > 0xffffffff) { - *err = g_strdup_printf("PDU-Transport IDs are only uint32 (ID: %i)", rec->pdu_id); + *err = ws_strdup_printf("PDU-Transport IDs are only uint32 (ID: %i)", rec->pdu_id); return FALSE; } @@ -1390,7 +1390,7 @@ update_spdu_ipdum_mapping(void *r, char **err) { spdu_ipdum_mapping_uat_t *rec = (spdu_ipdum_mapping_uat_t *)r; if (rec->pdu_id > 0xffffffff) { - *err = g_strdup_printf("IPduM IDs are only uint32 (ID: %i)", rec->pdu_id); + *err = ws_strdup_printf("IPduM IDs are only uint32 (ID: %i)", rec->pdu_id); return FALSE; } diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index d40e1789ad..ca2c5929e9 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -975,7 +975,7 @@ header_fields_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->header_name); if (c) { - *err = g_strdup_printf("Header name can't contain '%c'", c); + *err = ws_strdup_printf("Header name can't contain '%c'", c); return FALSE; } @@ -1047,7 +1047,7 @@ header_fields_post_update_cb(void) dynamic_hf[i].p_id = hf_id; dynamic_hf[i].hfinfo.name = header_name; - dynamic_hf[i].hfinfo.abbrev = g_strdup_printf("sip.%s", header_name); + dynamic_hf[i].hfinfo.abbrev = ws_strdup_printf("sip.%s", header_name); dynamic_hf[i].hfinfo.type = FT_STRING; dynamic_hf[i].hfinfo.display = BASE_NONE; dynamic_hf[i].hfinfo.strings = NULL; @@ -1105,7 +1105,7 @@ authorization_users_update_cb(void *r, char **err) */ c = proto_check_field_name(rec->username); if (c) { - *err = g_strdup_printf("Username can't contain '%c'", c); + *err = ws_strdup_printf("Username can't contain '%c'", c); return FALSE; } @@ -5875,7 +5875,7 @@ static void sip_stat_init(stat_tap_table_ui* new_stat) for (i = 1; sip_response_code_vals[i].strptr; i++) { unsigned response_code = sip_response_code_vals[i].value; items[REQ_RESP_METHOD_COLUMN].value.string_value = - g_strdup_printf("%u %s", response_code, sip_response_code_vals[i].strptr); + ws_strdup_printf("%u %s", response_code, sip_response_code_vals[i].strptr); items[REQ_RESP_METHOD_COLUMN].user_data.uint_value = response_code; stat_tap_init_table_row(resp_table, i-1, num_fields, items); } @@ -6031,11 +6031,11 @@ static gchar *sip_follow_conv_filter(epan_dissect_t *edt, packet_info *pinfo _U_ int hfid = proto_registrar_get_id_byname("sip.Call-ID"); GPtrArray *gp = proto_find_first_finfo(edt->tree, hfid); if (gp != NULL && gp->len != 0) { - filter = g_strdup_printf("sip.Call-ID == \"%s\"", (gchar *)fvalue_get(&((field_info *)gp->pdata[0])->value)); + filter = ws_strdup_printf("sip.Call-ID == \"%s\"", (gchar *)fvalue_get(&((field_info *)gp->pdata[0])->value)); } g_ptr_array_free(gp, TRUE); } else { - filter = g_strdup_printf("sip.Call-ID"); + filter = ws_strdup_printf("sip.Call-ID"); } return filter; diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 6e8f0043d9..1a7ada9c58 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2362,7 +2362,7 @@ dissect_skinny_displayLabel(ptvcursor_t *cursor, packet_info *pinfo, int hfindex } } if (show_replaced_str) { - si->additionalInfo = g_strdup_printf("\"%s\"", wmem_strbuf_get_str(wmem_new)); + si->additionalInfo = ws_strdup_printf("\"%s\"", wmem_strbuf_get_str(wmem_new)); proto_item_append_text(item, " => \"%s\"" , wmem_strbuf_get_str(wmem_new)); } ptvcursor_advance(cursor, length); @@ -2522,7 +2522,7 @@ handle_KeypadButtonMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ { guint32 hdr_data_length = tvb_get_letohl(ptvcursor_tvbuff(cursor), 0); - si->additionalInfo = g_strdup_printf("\"%s\"", + si->additionalInfo = ws_strdup_printf("\"%s\"", try_val_to_str_ext( tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)), &KeyPadButton_short_ext @@ -2838,7 +2838,7 @@ handle_OpenReceiveChannelAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_ ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &ipAddr, portNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); ipAddr_str = address_to_display(NULL, &ipAddr); - si->additionalInfo = g_strdup_printf("%s:%d", ipAddr_str, portNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", ipAddr_str, portNumber); wmem_free(NULL, ipAddr_str); passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -3000,7 +3000,7 @@ handle_MediaTransmissionFailureMessage(ptvcursor_t *cursor, packet_info * pinfo ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN); @@ -3423,7 +3423,7 @@ handle_OpenMultiMediaReceiveChannelAckMessage(ptvcursor_t *cursor, packet_info * ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &ipAddr, portNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); ipAddr_str = address_to_display(NULL, &ipAddr); - si->additionalInfo = g_strdup_printf("%s:%d", ipAddr_str, portNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", ipAddr_str, portNumber); wmem_free(NULL, ipAddr_str); passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -4340,7 +4340,7 @@ handle_PortResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_ ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &ipAddr, portNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); ipAddr_str = address_to_display(NULL, &ipAddr); - si->additionalInfo = g_strdup_printf("%s:%d", ipAddr_str, portNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", ipAddr_str, portNumber); wmem_free(NULL, ipAddr_str); ptvcursor_add(cursor, hf_skinny_RTCPPortNumber, 4, ENC_LITTLE_ENDIAN); if (hdr_version >= V19_MSG_TYPE) { @@ -4374,7 +4374,7 @@ handle_QoSResvNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN); } @@ -4404,7 +4404,7 @@ handle_QoSErrorNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinn ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_errorCode, 4, ENC_LITTLE_ENDIAN); @@ -4555,7 +4555,7 @@ handle_RegisterAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c static void handle_StartToneMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - si->additionalInfo = g_strdup_printf("\"%s\"", + si->additionalInfo = ws_strdup_printf("\"%s\"", try_val_to_str_ext( tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)), &DeviceTone_ext @@ -4684,7 +4684,7 @@ handle_StartMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN); compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -4879,7 +4879,7 @@ handle_CallInfoMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv ptvcursor_advance(cursor, 4); ptvcursor_pop_subtree(cursor); /* end bitfield: partyPIRestrictionBits */ if (si->callingParty && si->calledParty) { - si->additionalInfo = g_strdup_printf("\"%s -> %s\"", si->callingParty, si->calledParty); + si->additionalInfo = ws_strdup_printf("\"%s -> %s\"", si->callingParty, si->calledParty); } } @@ -5215,7 +5215,7 @@ handle_StartMulticastMediaReceptionMessage(ptvcursor_t *cursor, packet_info * pi ptvcursor_add(cursor, hf_skinny_multicastPortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &multicastIpAddr, multicastPortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); multicastIpAddr_str = address_to_display(NULL, &multicastIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", multicastIpAddr_str, multicastPortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", multicastIpAddr_str, multicastPortNumber); wmem_free(NULL, multicastIpAddr_str); ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN); compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -5278,7 +5278,7 @@ handle_StartMulticastMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * ptvcursor_add(cursor, hf_skinny_multicastPortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &multicastIpAddr, multicastPortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); multicastIpAddr_str = address_to_display(NULL, &multicastIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", multicastIpAddr_str, multicastPortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", multicastIpAddr_str, multicastPortNumber); wmem_free(NULL, multicastIpAddr_str); ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN); compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -5461,7 +5461,7 @@ handle_OpenReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s ptvcursor_add(cursor, hf_skinny_sourcePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &sourceIpAddr, sourcePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); sourceIpAddr_str = address_to_display(NULL, &sourceIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", sourceIpAddr_str, sourcePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", sourceIpAddr_str, sourcePortNumber); wmem_free(NULL, sourceIpAddr_str); } if (hdr_version >= V16_MSG_TYPE) { @@ -5708,7 +5708,7 @@ handle_SelectSoftKeysMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinn static void handle_CallStateMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - si->additionalInfo = g_strdup_printf("\"%s\"", + si->additionalInfo = ws_strdup_printf("\"%s\"", try_val_to_str_ext( tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)), &DCallState_ext @@ -5909,7 +5909,7 @@ handle_DialedNumberMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ guint32 dialedNumber_len; dialedNumber_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), 24)+1; if (dialedNumber_len > 1) { - si->additionalInfo = g_strdup_printf("\"%s\"", tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), dialedNumber_len)); + si->additionalInfo = ws_strdup_printf("\"%s\"", tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), dialedNumber_len)); } ptvcursor_add(cursor, hf_skinny_dialedNumber, 24, ENC_ASCII|ENC_NA); si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -5921,7 +5921,7 @@ handle_DialedNumberMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ guint32 dialedNumber_len; dialedNumber_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), VariableDirnumSize)+1; if (dialedNumber_len > 1) { - si->additionalInfo = g_strdup_printf("\"%s\"", tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), dialedNumber_len)); + si->additionalInfo = ws_strdup_printf("\"%s\"", tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), dialedNumber_len)); } ptvcursor_add(cursor, hf_skinny_dialedNumber, VariableDirnumSize, ENC_ASCII|ENC_NA); si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -6499,7 +6499,7 @@ handle_OpenMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pi ptvcursor_add(cursor, hf_skinny_sourcePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &sourceIpAddr, sourcePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); sourceIpAddr_str = address_to_display(NULL, &sourceIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", sourceIpAddr_str, sourcePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", sourceIpAddr_str, sourcePortNumber); wmem_free(NULL, sourceIpAddr_str); } if (hdr_version >= V16_MSG_TYPE) { @@ -7519,7 +7519,7 @@ handle_CallInfoV2Message(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co } } if (si->callingParty && si->calledParty) { - si->additionalInfo = g_strdup_printf("\"%s -> %s\"", si->callingParty, si->calledParty); + si->additionalInfo = ws_strdup_printf("\"%s -> %s\"", si->callingParty, si->calledParty); } } @@ -7589,7 +7589,7 @@ handle_QoSListenMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_resvStyle, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_maxRetryNumber, 4, ENC_LITTLE_ENDIAN); @@ -7636,7 +7636,7 @@ handle_QoSPathMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_ ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_resvStyle, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_maxRetryNumber, 4, ENC_LITTLE_ENDIAN); @@ -7682,7 +7682,7 @@ handle_QoSTeardownMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN); } @@ -7712,7 +7712,7 @@ handle_UpdateDSCPMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_DSCPValue, 4, ENC_LITTLE_ENDIAN); } @@ -7742,7 +7742,7 @@ handle_QoSModifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &remoteIpAddr, remotePortNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); remoteIpAddr_str = address_to_display(NULL, &remoteIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", remoteIpAddr_str, remotePortNumber); wmem_free(NULL, remoteIpAddr_str); ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN); @@ -7823,7 +7823,7 @@ handle_StartMediaTransmissionAckMessage(ptvcursor_t *cursor, packet_info * pinfo ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &transmitIpAddr, portNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); transmitIpAddr_str = address_to_display(NULL, &transmitIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", transmitIpAddr_str, portNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", transmitIpAddr_str, portNumber); wmem_free(NULL, transmitIpAddr_str); si->mediaTransmissionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_mediaTransmissionStatus, 4, ENC_LITTLE_ENDIAN); @@ -7857,7 +7857,7 @@ handle_StartMultiMediaTransmissionAckMessage(ptvcursor_t *cursor, packet_info * ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN); srtp_add_address(pinfo, PT_UDP, &transmitIpAddr, portNumber, 0, "SKINNY", pinfo->num, false, NULL, NULL, NULL); transmitIpAddr_str = address_to_display(NULL, &transmitIpAddr); - si->additionalInfo = g_strdup_printf("%s:%d", transmitIpAddr_str, portNumber); + si->additionalInfo = ws_strdup_printf("%s:%d", transmitIpAddr_str, portNumber); wmem_free(NULL, transmitIpAddr_str); si->multimediaTransmissionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_multimediaTransmissionStatus, 4, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in index 2f280329f6..cad14b5223 100644 --- a/epan/dissectors/packet-skinny.c.in +++ b/epan/dissectors/packet-skinny.c.in @@ -321,7 +321,7 @@ dissect_skinny_displayLabel(ptvcursor_t *cursor, packet_info *pinfo, int hfindex } } if (show_replaced_str) { - si->additionalInfo = g_strdup_printf("\"%s\"", wmem_strbuf_get_str(wmem_new)); + si->additionalInfo = ws_strdup_printf("\"%s\"", wmem_strbuf_get_str(wmem_new)); proto_item_append_text(item, " => \"%s\"" , wmem_strbuf_get_str(wmem_new)); } ptvcursor_advance(cursor, length); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index ec0d89cb84..2954a1e81d 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1306,7 +1306,7 @@ smb_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const if (new_file->is_out_of_memory) { entry->content_type = - g_strdup_printf("%s (%"PRIu64"?/%"PRIu64") %s [mem!!]", + ws_strdup_printf("%s (%"PRIu64"?/%"PRIu64") %s [mem!!]", aux_smb_fid_type_string, new_file->data_gathered, new_file->file_length, @@ -1319,7 +1319,7 @@ smb_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const } entry->content_type = - g_strdup_printf("%s (%"PRIu64"/%"PRIu64") %s [%5.2f%%]", + ws_strdup_printf("%s (%"PRIu64"/%"PRIu64") %s [%5.2f%%]", aux_smb_fid_type_string, new_file->data_gathered, new_file->file_length, @@ -1341,7 +1341,7 @@ smb_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const /* Modify the current_entry object_type string */ if (current_file->is_out_of_memory) { current_entry->content_type = - g_strdup_printf("%s (%"PRIu64"?/%"PRIu64") %s [mem!!]", + ws_strdup_printf("%s (%"PRIu64"?/%"PRIu64") %s [mem!!]", aux_smb_fid_type_string, current_file->data_gathered, current_file->file_length, @@ -1349,7 +1349,7 @@ smb_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const } else { percent = (gfloat) (100*current_file->data_gathered/current_file->file_length); current_entry->content_type = - g_strdup_printf("%s (%"PRIu64"/%"PRIu64") %s [%5.2f%%]", + ws_strdup_printf("%s (%"PRIu64"/%"PRIu64") %s [%5.2f%%]", aux_smb_fid_type_string, current_file->data_gathered, current_file->file_length, diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 83e528c3e8..fe8910b8db 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -191,13 +191,13 @@ update_interface_config(void *r, char **err) { interface_config_t *rec = (interface_config_t *)r; if (rec->interface_id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", + *err = ws_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", rec->interface_id, rec->interface_name); return FALSE; } if (rec->bus_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit bus identifiers (ID: %i Name: %s Bus-ID: %i)", + *err = ws_strdup_printf("We currently only support 16 bit bus identifiers (ID: %i Name: %s Bus-ID: %i)", rec->interface_id, rec->interface_name, rec->bus_id); return FALSE; } diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c index d16264fa42..8b23c01061 100644 --- a/epan/dissectors/packet-someip.c +++ b/epan/dissectors/packet-someip.c @@ -622,11 +622,11 @@ check_filter_string(gchar *filter_string, guint32 id) { c = proto_check_field_name(filter_string); if (c) { if (c == '.') { - err = g_strdup_printf("Filter String contains illegal chars '.' (ID: %i )", id); + err = ws_strdup_printf("Filter String contains illegal chars '.' (ID: %i )", id); } else if (g_ascii_isprint(c)) { - err = g_strdup_printf("Filter String contains illegal chars '%c' (ID: %i)", c, id); + err = ws_strdup_printf("Filter String contains illegal chars '%c' (ID: %i)", c, id); } else { - err = g_strdup_printf("Filter String contains invalid byte \\%03o (ID: %i)", c, id); + err = ws_strdup_printf("Filter String contains invalid byte \\%03o (ID: %i)", c, id); } } @@ -660,7 +660,7 @@ update_generic_one_identifier_16bit(void *r, char **err) { generic_one_id_string_t *rec = (generic_one_id_string_t *)r; if (rec->id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); return FALSE; } @@ -712,12 +712,12 @@ update_generic_two_identifier_16bit(void *r, char **err) { generic_two_id_string_t *rec = (generic_two_id_string_t *)r; if ( rec->id > 0xffff ) { - *err = g_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); return FALSE; } if ( rec->id2 > 0xffff ) { - *err = g_strdup_printf("We currently only support 16 bit identifiers (ID: %i ID2: %i Name: %s)", rec->id, rec->id2, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit identifiers (ID: %i ID2: %i Name: %s)", rec->id, rec->id2, rec->name); return FALSE; } @@ -1012,48 +1012,48 @@ update_someip_parameter_list(void *r, char **err) { guchar c; if (rec->service_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit Service IDs (Service-ID: %i Name: %s)", rec->service_id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit Service IDs (Service-ID: %i Name: %s)", rec->service_id, rec->name); return FALSE; } if (rec->method_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit Method IDs (Service-ID: %i Method-ID: %i Name: %s)", rec->service_id, rec->method_id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit Method IDs (Service-ID: %i Method-ID: %i Name: %s)", rec->service_id, rec->method_id, rec->name); return FALSE; } if (rec->version > 0xff) { - *err = g_strdup_printf("We currently only support 8 bit Version (Service-ID: %i Method-ID: %i Version: %d Name: %s)", rec->service_id, rec->method_id, rec->version, rec->name); + *err = ws_strdup_printf("We currently only support 8 bit Version (Service-ID: %i Method-ID: %i Version: %d Name: %s)", rec->service_id, rec->method_id, rec->version, rec->name); return FALSE; } if (rec->message_type > 0xff) { - *err = g_strdup_printf("We currently only support 8 bit Message Type (Service-ID: %i Method-ID: %i Version: %d Message Type: %x Name: %s)", rec->service_id, rec->method_id, rec->version, rec->message_type, rec->name); + *err = ws_strdup_printf("We currently only support 8 bit Message Type (Service-ID: %i Method-ID: %i Version: %d Message Type: %x Name: %s)", rec->service_id, rec->method_id, rec->version, rec->message_type, rec->name); return FALSE; } if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->pos >= rec->num_of_params) { - *err = g_strdup_printf("Position >= Number of Parameters"); + *err = ws_strdup_printf("Position >= Number of Parameters"); return FALSE; } if (rec->filter_string == NULL || rec->filter_string[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } c = proto_check_field_name(rec->filter_string); if (c) { if (c == '.') { - *err = g_strdup_printf("Filter String contains illegal chars '.' (Service-ID: %i Method-ID: %i)", rec->service_id, rec->method_id); + *err = ws_strdup_printf("Filter String contains illegal chars '.' (Service-ID: %i Method-ID: %i)", rec->service_id, rec->method_id); } else if (g_ascii_isprint(c)) { - *err = g_strdup_printf("Filter String contains illegal chars '%c' (Service-ID: %i Method-ID: %i)", c, rec->service_id, rec->method_id); + *err = ws_strdup_printf("Filter String contains illegal chars '%c' (Service-ID: %i Method-ID: %i)", c, rec->service_id, rec->method_id); } else { - *err = g_strdup_printf("Filter String contains invalid byte \\%03o (Service-ID: %i Method-ID: %i)", c, rec->service_id, rec->method_id); + *err = ws_strdup_printf("Filter String contains invalid byte \\%03o (Service-ID: %i Method-ID: %i)", c, rec->service_id, rec->method_id); } return FALSE; } @@ -1177,17 +1177,17 @@ update_someip_parameter_enum(void *r, char **err) { /* enum name is not used in a filter yet. */ if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->value_name == NULL || rec->value_name[0] == 0) { - *err = g_strdup_printf("Value Name cannot be empty"); + *err = ws_strdup_printf("Value Name cannot be empty"); return FALSE; } if (rec->num_of_items == 0) { - *err = g_strdup_printf("Number_of_Items = 0"); + *err = ws_strdup_printf("Number_of_Items = 0"); return FALSE; } @@ -1317,17 +1317,17 @@ update_someip_parameter_array(void *r, char **err) { char *tmp; if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->num >= rec->num_of_dims) { - *err = g_strdup_printf("Dimension >= Number of Dimensions"); + *err = ws_strdup_printf("Dimension >= Number of Dimensions"); return FALSE; } if (rec->filter_string == NULL || rec->filter_string[0] == 0) { - *err = g_strdup_printf("Filter String cannot be empty"); + *err = ws_strdup_printf("Filter String cannot be empty"); return FALSE; } @@ -1468,12 +1468,12 @@ update_someip_parameter_struct(void *r, char **err) { char *tmp = NULL; if (rec->struct_name == NULL || rec->struct_name[0] == 0) { - *err = g_strdup_printf("Struct name cannot be empty"); + *err = ws_strdup_printf("Struct name cannot be empty"); return FALSE; } if (rec->filter_string == NULL || rec->filter_string[0] == 0) { - *err = g_strdup_printf("Struct name cannot be empty"); + *err = ws_strdup_printf("Struct name cannot be empty"); return FALSE; } @@ -1484,12 +1484,12 @@ update_someip_parameter_struct(void *r, char **err) { } if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->pos >= rec->num_of_items) { - *err = g_strdup_printf("Position >= Number of Parameters"); + *err = ws_strdup_printf("Position >= Number of Parameters"); return FALSE; } @@ -1627,7 +1627,7 @@ update_someip_parameter_union(void *r, char **err) { gchar *tmp; if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Union name cannot be empty"); + *err = ws_strdup_printf("Union name cannot be empty"); return FALSE; } @@ -1638,7 +1638,7 @@ update_someip_parameter_union(void *r, char **err) { } if (rec->type_name == NULL || rec->type_name[0] == 0) { - *err = g_strdup_printf("Type Name cannot be empty"); + *err = ws_strdup_printf("Type Name cannot be empty"); return FALSE; } @@ -1761,12 +1761,12 @@ update_someip_parameter_base_type_list(void *r, char **err) { someip_parameter_base_type_list_uat_t *rec = (someip_parameter_base_type_list_uat_t *)r; if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit IDs (%i) Name: %s", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 32 bit IDs (%i) Name: %s", rec->id, rec->name); return FALSE; } @@ -1850,22 +1850,22 @@ update_someip_parameter_string_list(void *r, char **err) { someip_parameter_string_uat_t *rec = (someip_parameter_string_uat_t *)r; if (rec->name == NULL || rec->name[0] == 0) { - *err = g_strdup_printf("Name cannot be empty"); + *err = ws_strdup_printf("Name cannot be empty"); return FALSE; } if (rec->id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit IDs (%i) Name: %s", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 32 bit IDs (%i) Name: %s", rec->id, rec->name); return FALSE; } if (rec->max_length > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit max_length (%i) Name: %s", rec->max_length, rec->name); + *err = ws_strdup_printf("We currently only support 32 bit max_length (%i) Name: %s", rec->max_length, rec->name); return FALSE; } if (rec->length_of_length != 0 && rec->length_of_length != 8 && rec->length_of_length != 16 && rec->length_of_length != 32) { - *err = g_strdup_printf("length_of_length can be only 0, 8, 16, or 32 but not %d (IDs: %i Name: %s)", rec->length_of_length, rec->id, rec->name); + *err = ws_strdup_printf("length_of_length can be only 0, 8, 16, or 32 but not %d (IDs: %i Name: %s)", rec->length_of_length, rec->id, rec->name); return FALSE; } @@ -1936,7 +1936,7 @@ update_someip_parameter_typedef_list(void *r, char **err) { someip_parameter_typedef_uat_t *rec = (someip_parameter_typedef_uat_t *)r; if (rec->id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit IDs (%i) Name: %s", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 32 bit IDs (%i) Name: %s", rec->id, rec->name); return FALSE; } @@ -2124,7 +2124,7 @@ update_dynamic_hf_entry(hf_register_info *hf_array, int pos, guint32 data_type, if (attribs.base_type_name == NULL) { hf_array[pos].hfinfo.name = g_strdup(param_name); } else { - hf_array[pos].hfinfo.name = g_strdup_printf("%s [%s]", param_name, attribs.base_type_name); + hf_array[pos].hfinfo.name = ws_strdup_printf("%s [%s]", param_name, attribs.base_type_name); } hf_array[pos].hfinfo.abbrev = abbrev; @@ -2165,7 +2165,7 @@ update_dynamic_param_hf_entry(gpointer key _U_, gpointer value, gpointer data) { if (service_name == NULL) { service_name_needs_free = TRUE; - service_name = g_strdup_printf("0x%04x", list->service_id); + service_name = ws_strdup_printf("0x%04x", list->service_id); } if (method_name != NULL) { @@ -2177,10 +2177,10 @@ update_dynamic_param_hf_entry(gpointer key _U_, gpointer value, gpointer data) { if (method_name == NULL) { method_name_needs_free = TRUE; - method_name = g_strdup_printf("0x%04x", list->method_id); + method_name = ws_strdup_printf("0x%04x", list->method_id); } - char *abbrev = g_strdup_printf("someip.payload.%s", item->filter_string); + char *abbrev = ws_strdup_printf("someip.payload.%s", item->filter_string); item->hf_id = update_dynamic_hf_entry(dynamic_hf_param, *pos, item->data_type, item->id_ref, item->name, abbrev); if (service_name_needs_free) { @@ -2207,7 +2207,7 @@ update_dynamic_array_hf_entry(gpointer key _U_, gpointer value, gpointer data) { return; } - abbrev = g_strdup_printf("someip.payload.%s", item->filter_string); + abbrev = ws_strdup_printf("someip.payload.%s", item->filter_string); item->hf_id = update_dynamic_hf_entry(dynamic_hf_array, *pos, item->data_type, item->id_ref, item->name, abbrev); if (item->hf_id != NULL) { @@ -2228,7 +2228,7 @@ update_dynamic_struct_hf_entry(gpointer key _U_, gpointer value, gpointer data) for (i = 0; i < list->num_of_items; i++) { someip_payload_parameter_item_t *item = &(list->items[i]); - char *abbrev = g_strdup_printf("someip.payload.%s", item->filter_string); + char *abbrev = ws_strdup_printf("someip.payload.%s", item->filter_string); item->hf_id = update_dynamic_hf_entry(dynamic_hf_struct, *pos, item->data_type, item->id_ref, item->name, abbrev); if (item->hf_id != NULL) { @@ -2250,7 +2250,7 @@ update_dynamic_union_hf_entry(gpointer key _U_, gpointer value, gpointer data) { for (i = 0; i < list->num_of_items; i++) { someip_parameter_union_item_t *item = &(list->items[i]); - char *abbrev = g_strdup_printf("someip.payload.%s", item->filter_string); + char *abbrev = ws_strdup_printf("someip.payload.%s", item->filter_string); item->hf_id = update_dynamic_hf_entry(dynamic_hf_union, *pos, item->data_type, item->id_ref, item->name, abbrev); if (item->hf_id != NULL) { diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 8456b7bbf0..9705449f08 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -919,7 +919,7 @@ tcp_build_filter(packet_info *pinfo) { if( pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4 ) { /* TCP over IPv4 */ - return g_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", + return ws_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); @@ -927,7 +927,7 @@ tcp_build_filter(packet_info *pinfo) if( pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6 ) { /* TCP over IPv6 */ - return g_strdup_printf("(ipv6.addr eq %s and ipv6.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", + return ws_strdup_printf("(ipv6.addr eq %s and ipv6.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); @@ -958,7 +958,7 @@ tcp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, flags = tcp_flags_to_str(NULL, tcph); if ((tcph->th_have_seglen)&&(tcph->th_seglen!=0)){ - sai->frame_label = g_strdup_printf("%s - Len: %u",flags, tcph->th_seglen); + sai->frame_label = ws_strdup_printf("%s - Len: %u",flags, tcph->th_seglen); } else{ sai->frame_label = g_strdup(flags); @@ -967,9 +967,9 @@ tcp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, wmem_free(NULL, flags); if (tcph->th_flags & TH_ACK) - sai->comment = g_strdup_printf("Seq = %u Ack = %u",tcph->th_seq, tcph->th_ack); + sai->comment = ws_strdup_printf("Seq = %u Ack = %u",tcph->th_seq, tcph->th_ack); else - sai->comment = g_strdup_printf("Seq = %u",tcph->th_seq); + sai->comment = ws_strdup_printf("Seq = %u",tcph->th_seq); sai->line_style = 1; sai->conv_num = (guint16) tcph->th_stream; @@ -996,7 +996,7 @@ gchar *tcp_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo, guint return NULL; *stream = tcpd->stream; - return g_strdup_printf("tcp.stream eq %u", tcpd->stream); + return ws_strdup_printf("tcp.stream eq %u", tcpd->stream); } return NULL; @@ -1004,7 +1004,7 @@ gchar *tcp_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo, guint gchar *tcp_follow_index_filter(guint stream, guint sub_stream _U_) { - return g_strdup_printf("tcp.stream eq %u", stream); + return ws_strdup_printf("tcp.stream eq %u", stream); } gchar *tcp_follow_address_filter(address *src_addr, address *dst_addr, int src_port, int dst_port) @@ -1016,7 +1016,7 @@ gchar *tcp_follow_address_filter(address *src_addr, address *dst_addr, int src_p address_to_str_buf(src_addr, src_addr_str, sizeof(src_addr_str)); address_to_str_buf(dst_addr, dst_addr_str, sizeof(dst_addr_str)); - return g_strdup_printf("((ip%s.src eq %s and tcp.srcport eq %d) and " + return ws_strdup_printf("((ip%s.src eq %s and tcp.srcport eq %d) and " "(ip%s.dst eq %s and tcp.dstport eq %d))" " or " "((ip%s.src eq %s and tcp.srcport eq %d) and " @@ -1131,7 +1131,7 @@ check_follow_fragments(follow_info_t *follow_info, gboolean is_server, guint32 a * by the receiving host. Add dummy stream chunk with the data * "[xxx bytes missing in capture file]". */ - dummy_str = g_strdup_printf("[%d bytes missing in capture file]", + dummy_str = ws_strdup_printf("[%d bytes missing in capture file]", (int)(lowest_seq - follow_info->seq[is_server]) ); // XXX the dummy replacement could be larger than the actual missing bytes. diff --git a/epan/dissectors/packet-tecmp.c b/epan/dissectors/packet-tecmp.c index 42ac11c28d..7f2a1442bf 100644 --- a/epan/dissectors/packet-tecmp.c +++ b/epan/dissectors/packet-tecmp.c @@ -488,7 +488,7 @@ update_generic_one_identifier_16bit(void *r, char **err) { generic_one_id_string_t *rec = (generic_one_id_string_t *)r; if (rec->id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); return FALSE; } @@ -555,7 +555,7 @@ update_channel_config(void *r, char **err) { channel_config_t *rec = (channel_config_t *)r; if (rec->id > 0xffffffff) { - *err = g_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 32 bit identifiers (ID: %i Name: %s)", rec->id, rec->name); return FALSE; } @@ -565,7 +565,7 @@ update_channel_config(void *r, char **err) { } if (rec->bus_id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit bus identifiers (ID: %i Name: %s Bus-ID: %i)", rec->id, rec->name, rec->bus_id); + *err = ws_strdup_printf("We currently only support 16 bit bus identifiers (ID: %i Name: %s Bus-ID: %i)", rec->id, rec->name, rec->bus_id); return FALSE; } diff --git a/epan/dissectors/packet-tibia.c b/epan/dissectors/packet-tibia.c index 7e6daebbbd..e44813740a 100644 --- a/epan/dissectors/packet-tibia.c +++ b/epan/dissectors/packet-tibia.c @@ -1740,7 +1740,7 @@ rsakeys_uat_fld_ip_chk_cb(void* r _U_, const char* ipaddr, guint len _U_, const return TRUE; } - *err = g_strdup_printf("No IPv4 address given."); + *err = ws_strdup_printf("No IPv4 address given."); return FALSE; } @@ -1762,7 +1762,7 @@ rsakeys_uat_fld_fileopen_chk_cb(void* r _U_, const char* p, guint len _U_, const if (p && *p) { ws_statb64 st; if (ws_stat64(p, &st) != 0) { - *err = g_strdup_printf("File '%s' does not exist or access is denied.", p); + *err = ws_strdup_printf("File '%s' does not exist or access is denied.", p); return FALSE; } } else { @@ -1785,7 +1785,7 @@ rsakeys_uat_fld_password_chk_cb(void *r, const char *p, guint len _U_, const voi gnutls_x509_privkey_t priv_key = rsa_load_pkcs12(fp, p, &msg); if (!priv_key) { fclose(fp); - *err = g_strdup_printf("Could not load PKCS#12 key file: %s", msg); + *err = ws_strdup_printf("Could not load PKCS#12 key file: %s", msg); g_free(msg); return FALSE; } @@ -1793,7 +1793,7 @@ rsakeys_uat_fld_password_chk_cb(void *r, const char *p, guint len _U_, const voi gnutls_x509_privkey_deinit(priv_key); fclose(fp); } else { - *err = g_strdup_printf("Leave this field blank if the keyfile is not PKCS#12."); + *err = ws_strdup_printf("Leave this field blank if the keyfile is not PKCS#12."); return FALSE; } } @@ -1865,7 +1865,7 @@ xteakeys_uat_fld_key_chk_cb(void *r _U_, const char *key, guint len, const void } } - *err = g_strdup_printf("XTEA keys are 32 character long hex strings."); + *err = ws_strdup_printf("XTEA keys are 32 character long hex strings."); return FALSE; } diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c index ef2b203fb4..a271be9261 100644 --- a/epan/dissectors/packet-tls-utils.c +++ b/epan/dissectors/packet-tls-utils.c @@ -6322,7 +6322,7 @@ ssldecrypt_uat_fld_fileopen_chk_cb(void* r _U_, const char* p, guint len _U_, co return FALSE; } else { if (ws_stat64(p, &st) != 0) { - *err = g_strdup_printf("File '%s' does not exist or access is denied.", p); + *err = ws_strdup_printf("File '%s' does not exist or access is denied.", p); return FALSE; } } @@ -6345,7 +6345,7 @@ ssldecrypt_uat_fld_password_chk_cb(void *r _U_, const char *p _U_, guint len _U_ gnutls_x509_privkey_t priv_key = rsa_load_pkcs12(fp, p, &msg); if (!priv_key) { fclose(fp); - *err = g_strdup_printf("Could not load PKCS#12 key file: %s", msg); + *err = ws_strdup_printf("Could not load PKCS#12 key file: %s", msg); g_free(msg); return FALSE; } @@ -6353,7 +6353,7 @@ ssldecrypt_uat_fld_password_chk_cb(void *r _U_, const char *p _U_, guint len _U_ gnutls_x509_privkey_deinit(priv_key); fclose(fp); } else { - *err = g_strdup_printf("Leave this field blank if the keyfile is not PKCS#12."); + *err = ws_strdup_printf("Leave this field blank if the keyfile is not PKCS#12."); return FALSE; } } diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 6b8c0db0eb..0d170d866e 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -4052,12 +4052,12 @@ ssldecrypt_uat_fld_protocol_chk_cb(void* r _U_, const char* p, guint len _U_, co if (!ssl_find_appdata_dissector(p)) { if (proto_get_id_by_filter_name(p) != -1) { - *err = g_strdup_printf("While '%s' is a valid dissector filter name, that dissector is not configured" + *err = ws_strdup_printf("While '%s' is a valid dissector filter name, that dissector is not configured" " to support TLS decryption.\n\n" "If you need to decrypt '%s' over TLS, please contact the Wireshark development team.", p, p); } else { char* ssl_str = ssl_association_info("tls.port", "TCP"); - *err = g_strdup_printf("Could not find dissector for: '%s'\nCommonly used TLS dissectors include:\n%s", p, ssl_str); + *err = ws_strdup_printf("Could not find dissector for: '%s'\nCommonly used TLS dissectors include:\n%s", p, ssl_str); g_free(ssl_str); } return FALSE; diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 37f3acd327..c4c92915fb 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -353,7 +353,7 @@ udp_build_filter(packet_info *pinfo) { if( pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4 ) { /* UDP over IPv4 */ - return g_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", + return ws_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); @@ -361,7 +361,7 @@ udp_build_filter(packet_info *pinfo) if( pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6 ) { /* UDP over IPv6 */ - return g_strdup_printf("(ipv6.addr eq %s and ipv6.addr eq %s) and (udp.port eq %d and udp.port eq %d)", + return ws_strdup_printf("(ipv6.addr eq %s and ipv6.addr eq %s) and (udp.port eq %d and udp.port eq %d)", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); @@ -384,7 +384,7 @@ static gchar *udp_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo return NULL; *stream = udpd->stream; - return g_strdup_printf("udp.stream eq %u", udpd->stream); + return ws_strdup_printf("udp.stream eq %u", udpd->stream); } return NULL; @@ -392,7 +392,7 @@ static gchar *udp_follow_conv_filter(epan_dissect_t *edt _U_, packet_info *pinfo static gchar *udp_follow_index_filter(guint stream, guint sub_stream _U_) { - return g_strdup_printf("udp.stream eq %u", stream); + return ws_strdup_printf("udp.stream eq %u", stream); } static gchar *udp_follow_address_filter(address *src_addr, address *dst_addr, int src_port, int dst_port) @@ -404,7 +404,7 @@ static gchar *udp_follow_address_filter(address *src_addr, address *dst_addr, in address_to_str_buf(src_addr, src_addr_str, sizeof(src_addr_str)); address_to_str_buf(dst_addr, dst_addr_str, sizeof(dst_addr_str)); - return g_strdup_printf("((ip%s.src eq %s and udp.srcport eq %d) and " + return ws_strdup_printf("((ip%s.src eq %s and udp.srcport eq %d) and " "(ip%s.dst eq %s and udp.dstport eq %d))" " or " "((ip%s.src eq %s and udp.srcport eq %d) and " diff --git a/epan/dissectors/packet-uds.c b/epan/dissectors/packet-uds.c index f7656e393d..ac9e96ad5a 100644 --- a/epan/dissectors/packet-uds.c +++ b/epan/dissectors/packet-uds.c @@ -410,12 +410,12 @@ update_generic_addr_id_16bit(void *r, char **err) { generic_addr_id_string_t *rec = (generic_addr_id_string_t *)r; if (rec->id > 0xffff) { - *err = g_strdup_printf("We currently only support 16 bit identifiers (Addr: %x ID: %i Name: %s)", rec->address, rec->id, rec->name); + *err = ws_strdup_printf("We currently only support 16 bit identifiers (Addr: %x ID: %i Name: %s)", rec->address, rec->id, rec->name); return FALSE; } if (rec->address > 0xffff && rec->address != G_MAXUINT32) { - *err = g_strdup_printf("We currently only support 16 bit addresses with 0xffffffff = \"don't care\" (Addr: %x ID: %i Name: %s)", + *err = ws_strdup_printf("We currently only support 16 bit addresses with 0xffffffff = \"don't care\" (Addr: %x ID: %i Name: %s)", rec->address, rec->id, rec->name); return FALSE; } diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index a3e187c631..f4d3b9eb0e 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -3041,7 +3041,7 @@ wkh_profile_warning(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i if (ok) { /* Valid warn-target string */ /* TODO: Why did we just call get_uri_value() and not use * the str, since the pointer to it is immediately - * forgotten with the call to g_strdup_printf()? */ + * forgotten with the call to ws_strdup_printf()? */ off += len; proto_item_append_text(ti, "; target=%s", val_str); /* Add zero or more dates */ diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 2ccbb945c7..0e7fa0e72b 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -642,7 +642,7 @@ uat_key_record_update_cb(void *r, char **err) if (rec->string[0] != 0) { *err = NULL; if (!zbee_gp_security_parse_key(rec->string, rec->key, rec->byte_order)) { - *err = g_strdup_printf("Expecting %d hexadecimal bytes or a %d character double-quoted string", + *err = ws_strdup_printf("Expecting %d hexadecimal bytes or a %d character double-quoted string", ZBEE_SEC_CONST_KEYSIZE, ZBEE_SEC_CONST_KEYSIZE); return FALSE; } diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 2212bb388c..0215d3ecf0 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1856,7 +1856,7 @@ static gboolean zbee_nwk_filter_valid(packet_info *pinfo) static gchar* zbee_nwk_build_filter(packet_info *pinfo) { - return g_strdup_printf("zbee_nwk.addr eq %s and zbee_nwk.addr eq %s", + return ws_strdup_printf("zbee_nwk.addr eq %s and zbee_nwk.addr eq %s", address_to_str(pinfo->pool, &pinfo->net_src), address_to_str(pinfo->pool, &pinfo->net_dst)); } diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index c9af0ff709..3c09f98f34 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -148,7 +148,7 @@ static gboolean uat_key_record_update_cb(void* r, char** err) { if (rec->string[0] != 0) { *err = NULL; if ( !zbee_security_parse_key(rec->string, key, rec->byte_order) ) { - *err = g_strdup_printf("Expecting %d hexadecimal bytes or\n" + *err = ws_strdup_printf("Expecting %d hexadecimal bytes or\n" "a %d character double-quoted string", ZBEE_SEC_CONST_KEYSIZE, ZBEE_SEC_CONST_KEYSIZE); return FALSE; } |