wsutil: rename bytestring_to_str() -> bytes_to_str_punct()

9 files changed, 11 insertions, 11 deletions

diff --git a/epan/dissectors/asn1/h248/h248.cnf b/epan/dissectors/asn1/h248/h248.cnf
index 6f457c2875..7cb58c325b 100644
--- a/epan/dissectors/asn1/h248/h248.cnf
+++ b/epan/dissectors/asn1/h248/h248.cnf
@@ -362,10 +362,10 @@ SigParameterV1/value                ABBREV=sig_param_value
 			curr_info.term->buffer = (guint8 *)tvb_memdup(actx->pinfo->pool,new_tvb,0,curr_info.term->len);
 			if(term_info.str){
 				curr_info.term->str = wmem_strdup_printf(actx->pinfo->pool, "%s %s",
-											bytestring_to_str(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0),
+											bytes_to_str_punct(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0),
 											term_info.str);
 			}else{
-				curr_info.term->str = bytestring_to_str(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0);
+				curr_info.term->str = bytes_to_str_punct(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0);
 			}
 		}
 
diff --git a/epan/dissectors/asn1/snmp/snmp.cnf b/epan/dissectors/asn1/snmp/snmp.cnf
index a090c2a3b4..fe7947a32e 100644
--- a/epan/dissectors/asn1/snmp/snmp.cnf
+++ b/epan/dissectors/asn1/snmp/snmp.cnf
@@ -221,7 +221,7 @@ BulkPDU/request-id bulkPDU_request-id
 			if (usm_p.authOK) {
 				expert = &ei_snmp_authentication_ok;
 			} else {
-				const gchar* calc_auth_str = bytestring_to_str(actx->pinfo->pool, calc_auth,calc_auth_len,' ');
+				const gchar* calc_auth_str = bytes_to_str_punct(actx->pinfo->pool, calc_auth,calc_auth_len,' ');
 				proto_item_append_text(authen_item, " calculated = %s", calc_auth_str);
 				expert = &ei_snmp_authentication_error;
 			}
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index b626cd95e1..b8b73e958d 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -113,7 +113,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 				cp = tvb_get_ptr(tvb, 0, bytes);
 
 				gcry_md_hash_buffer(GCRY_MD_MD5, digest, cp, bytes);
-				digest_string = bytestring_to_str(pinfo->pool, digest, HASH_MD5_LENGTH, '\0');
+				digest_string = bytes_to_str_punct(pinfo->pool, digest, HASH_MD5_LENGTH, '\0');
 				ti = proto_tree_add_string(data_tree, &hfi_data_md5_hash, tvb, 0, 0, digest_string);
 				proto_item_set_generated(ti);
 			}
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 98dbf7114f..41b178ccd3 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -739,7 +739,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 			cp = tvb_get_ptr(tvb, 0, cap_len);
 
 			gcry_md_hash_buffer(GCRY_MD_MD5, digest, cp, cap_len);
-			digest_string = bytestring_to_str(pinfo->pool, digest, HASH_MD5_LENGTH, '\0');
+			digest_string = bytes_to_str_punct(pinfo->pool, digest, HASH_MD5_LENGTH, '\0');
 			ti = proto_tree_add_string(fh_tree, hf_frame_md5_hash, tvb, 0, 0, digest_string);
 			proto_item_set_generated(ti);
 		}
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 67a6f9cf3d..d27797a3af 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -2981,10 +2981,10 @@ dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 			curr_info.term->buffer = (guint8 *)tvb_memdup(actx->pinfo->pool,new_tvb,0,curr_info.term->len);
 			if(term_info.str){
 				curr_info.term->str = wmem_strdup_printf(actx->pinfo->pool, "%s %s",
-											bytestring_to_str(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0),
+											bytes_to_str_punct(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0),
 											term_info.str);
 			}else{
-				curr_info.term->str = bytestring_to_str(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0);
+				curr_info.term->str = bytes_to_str_punct(actx->pinfo->pool,curr_info.term->buffer,curr_info.term->len, 0);
 			}
 		}
 
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index c5253873cc..258eb7b8ee 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -220,7 +220,7 @@ ipx_addr_to_str(const guint32 net, const guint8 *ad)
 	else {
 		buf = wmem_strdup_printf(wmem_packet_scope(), "%s.%s",
 				get_ipxnet_name(wmem_packet_scope(), net),
-				bytestring_to_str(wmem_packet_scope(), ad, 6, '\0'));
+				bytes_to_str_punct(wmem_packet_scope(), ad, 6, '\0'));
 	}
 	return buf;
 }
diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c
index f414b5b137..9ff7cec8f9 100644
--- a/epan/dissectors/packet-mswsp.c
+++ b/epan/dissectors/packet-mswsp.c
@@ -3044,7 +3044,7 @@ static int parse_guid(tvbuff_t *tvb, int offset, proto_tree *tree, e_guid_t *gui
 	offset += 1;
 	proto_tree_add_item(tr, hf_mswsp_guid_time_clock_low, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 	offset += 1;
-	bytes = bytestring_to_str(wmem_packet_scope(), &guid->data4[2], 6, ':');
+	bytes = bytes_to_str_punct(wmem_packet_scope(), &guid->data4[2], 6, ':');
 	proto_tree_add_string(tr, hf_mswsp_guid_node, tvb, offset, 6, bytes);
 
 	offset += 6;
diff --git a/epan/dissectors/packet-rtps-virtual-transport.c b/epan/dissectors/packet-rtps-virtual-transport.c
index 2ceb294189..7e767e1b46 100644
--- a/epan/dissectors/packet-rtps-virtual-transport.c
+++ b/epan/dissectors/packet-rtps-virtual-transport.c
@@ -494,7 +494,7 @@ static gint dissect_parameter_transport_rtps_type(
                         tvb,
                         OFFSET_TO_VAL,
                         param_length);
-                const gchar *guid_string = bytestring_to_str(
+                const gchar *guid_string = bytes_to_str_punct(
                         pinfo->pool,
                         guid_bytes,
                         MIN(param_length, 12),
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index e090a4f6c3..1b847bbb09 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -2869,7 +2869,7 @@ dissect_snmp_SNMPv3Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 			if (usm_p.authOK) {
 				expert = &ei_snmp_authentication_ok;
 			} else {
-				const gchar* calc_auth_str = bytestring_to_str(actx->pinfo->pool, calc_auth,calc_auth_len,' ');
+				const gchar* calc_auth_str = bytes_to_str_punct(actx->pinfo->pool, calc_auth,calc_auth_len,' ');
 				proto_item_append_text(authen_item, " calculated = %s", calc_auth_str);
 				expert = &ei_snmp_authentication_error;
 			}