aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/asn1/ldap/packet-ldap-template.c2
-rw-r--r--epan/dissectors/packet-dhcp.c16
-rw-r--r--epan/dissectors/packet-dhcpv6.c4
-rw-r--r--epan/dissectors/packet-dns.c78
-rw-r--r--epan/dissectors/packet-dns.h2
-rw-r--r--epan/dissectors/packet-gsm_gsup.c2
-rw-r--r--epan/dissectors/packet-icmpv6.c6
-rw-r--r--epan/dissectors/packet-ldap.c2
-rw-r--r--epan/dissectors/packet-lwres.c6
-rw-r--r--epan/dissectors/packet-nbt.c6
-rw-r--r--epan/dissectors/packet-smb-common.c2
11 files changed, 63 insertions, 63 deletions
diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c
index 1891589424..eb60501c29 100644
--- a/epan/dissectors/asn1/ldap/packet-ldap-template.c
+++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c
@@ -1302,7 +1302,7 @@ static void
int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_)
{
int compr_len;
- const guchar *name;
+ const gchar *name;
guint name_len;
/* The name data MUST start at offset 0 of the tvb */
diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index 3ab58ab954..3d52b60266 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -2449,8 +2449,8 @@ dissect_dhcpopt_client_full_domain_name(tvbuff_t *tvb, packet_info *pinfo, proto
};
guint8 fqdn_flags;
int offset = 0, length = tvb_reported_length(tvb);
- const guchar *dns_name;
- guint dns_name_len;
+ const gchar *dns_name;
+ guint dns_name_len;
if (length < 3) {
expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length isn't >= 3");
@@ -2774,8 +2774,8 @@ static int
dissect_dhcpopt_dhcp_domain_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
{
int length = tvb_reported_length(tvb);
- const guchar *dns_name;
- guint dns_name_len;
+ const gchar *dns_name;
+ guint dns_name_len;
/* Encoding Long Options in the Dynamic Host Configuration Protocol (DHCPv4) (RFC 3396) */
/* Domain Names - Implementation And Specification (RFC 1035) */
@@ -2829,8 +2829,8 @@ static int
dissect_dhcpopt_sip_servers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
int length = tvb_reported_length(tvb);
- const guchar *dns_name;
- guint dns_name_len;
+ const gchar *dns_name;
+ guint dns_name_len;
/* Encoding Long Options in the Dynamic Host Configuration Protocol (DHCPv4) (RFC 3396) */
/* Domain Names - Implementation And Specification (RFC 1035) */
@@ -3082,7 +3082,7 @@ static int
dissect_dhcpopt_rdnss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
int offset = 0;
- const guchar *dns_name;
+ const gchar *dns_name;
guint dns_name_len;
if (tvb_reported_length(tvb) < 10) {
@@ -6603,7 +6603,7 @@ dissect_packetcable_ietf_ccc(packet_info *pinfo, proto_item *v_ti, proto_tree *v
proto_tree *pkt_s_tree;
proto_item *vti;
int max_timer_val = 255;
- const guchar *dns_name;
+ const gchar *dns_name;
guint dns_name_len;
subopt = tvb_get_guint8(tvb, suboptoff);
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 7c9495214f..06021b81d1 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -2383,7 +2383,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
break;
case OPTION_F_DNS_HOST_NAME:
{
- const guchar *dns_name;
+ const gchar *dns_name;
guint dns_name_len;
get_dns_name(tvb, off, optlen, off, &dns_name, &dns_name_len);
@@ -2392,7 +2392,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
}
case OPTION_F_DNS_ZONE_NAME:
{
- const guchar *dns_name;
+ const gchar *dns_name;
guint dns_name_len;
get_dns_name(tvb, off, optlen, off, &dns_name, &dns_name_len);
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 3557bd6b2d..fb8eec6147 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -1163,10 +1163,10 @@ qname_labels_count(const guchar* name, guint name_len)
*/
static int
expand_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
- const guchar **name, guint* name_len)
+ const gchar **name, guint* name_len)
{
int start_offset = offset;
- guchar *np;
+ gchar *np;
int len = -1;
int pointers_count = 0;
int component_len;
@@ -1179,7 +1179,7 @@ expand_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
* to put the dissector into a loop. Instead we throw an exception */
maxname = MAX_DNAME_LEN;
- np=(guchar *)wmem_alloc(wmem_packet_scope(), maxname);
+ np=(gchar *)wmem_alloc(wmem_packet_scope(), maxname);
*name=np;
(*name_len) = 0;
@@ -1346,7 +1346,7 @@ expand_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
can contain null bytes, is written in name and its length in name_len. */
int
get_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
- const guchar **name, guint* name_len)
+ const gchar **name, guint* name_len)
{
int len;
@@ -1368,7 +1368,7 @@ get_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
static int
get_dns_name_type_class(tvbuff_t *tvb, int offset, int dns_data_offset,
- const guchar **name, int *name_len, int *type, int *dns_class)
+ const gchar **name, int *name_len, int *type, int *dns_class)
{
int start_offset = offset;
@@ -1442,7 +1442,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
packet_info *pinfo, proto_tree *dns_tree, gboolean is_mdns)
{
int used_bytes;
- const guchar *name;
+ const gchar *name;
gchar *name_out;
int name_len;
int type;
@@ -1797,7 +1797,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
proto_tree *dns_tree, packet_info *pinfo,
gboolean is_mdns)
{
- const guchar *name;
+ const gchar *name;
gchar *name_out;
int name_len;
int dns_type;
@@ -1896,7 +1896,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_NS: /* an authoritative Name Server (2) */
{
- const guchar *ns_name;
+ const gchar *ns_name;
int ns_name_len;
used_bytes = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &ns_name, &ns_name_len);
@@ -1911,7 +1911,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MD: /* Mail Destination (3) */
{
int hostname_len;
- const guchar *hostname_str;
+ const gchar *hostname_str;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -1924,7 +1924,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MF: /* Mail Forwader (4) */
{
int hostname_len;
- const guchar *hostname_str;
+ const gchar *hostname_str;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -1936,7 +1936,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_CNAME: /* the Canonical NAME for an alias (5) */
{
- const guchar *cname;
+ const gchar *cname;
int cname_len;
used_bytes = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &cname, &cname_len);
@@ -1950,9 +1950,9 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_SOA: /* Start Of Authority zone (6) */
{
- const guchar *mname;
+ const gchar *mname;
int mname_len;
- const guchar *rname;
+ const gchar *rname;
int rname_len;
proto_item *ti_soa;
@@ -1991,7 +1991,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MB: /* MailBox domain (7) */
{
int hostname_len;
- const guchar *hostname_str;
+ const gchar *hostname_str;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2004,7 +2004,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MG: /* Mail Group member (8) */
{
int hostname_len;
- const guchar *hostname_str;
+ const gchar *hostname_str;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2017,7 +2017,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MR: /* Mail Rename domain (9) */
{
int hostname_len;
- const guchar *hostname_str;
+ const gchar *hostname_str;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2101,7 +2101,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_PTR: /* Domain Name Pointer (12) */
{
- const guchar *pname;
+ const gchar *pname;
int pname_len;
used_bytes = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &pname, &pname_len);
@@ -2146,7 +2146,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MINFO: /* Mailbox or Mail list INFOrmation (14) */
{
int rmailbx_len, emailbx_len;
- const guchar *rmailbx_str, *emailbx_str;
+ const gchar *rmailbx_str, *emailbx_str;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2163,7 +2163,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_MX: /* Mail eXchange (15) */
{
guint16 preference = 0;
- const guchar *mx_name;
+ const gchar *mx_name;
int mx_name_len;
preference = tvb_get_ntohs(tvb, cur_offset);
@@ -2202,7 +2202,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_RP: /* Responsible Person (17) */
{
int mbox_dname_len, txt_dname_len;
- const guchar *mbox_dname, *txt_dname;
+ const gchar *mbox_dname, *txt_dname;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2219,7 +2219,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_AFSDB: /* AFS data base location (18) */
{
- const guchar *host_name;
+ const gchar *host_name;
int host_name_len;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2277,7 +2277,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_RT: /* Route-Through (21) */
{
- const guchar *host_name;
+ const gchar *host_name;
int host_name_len;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2302,7 +2302,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_NSAP_PTR: /* for domain name pointer, NSAP style (23) */
{
int nsap_ptr_owner_len;
- const guchar *nsap_ptr_owner;
+ const gchar *nsap_ptr_owner;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -2363,7 +2363,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_PX: /* Pointer to X.400/RFC822 mapping info (26)*/
{
guint px_map822_len, px_mapx400_len;
- const guchar *px_map822_dnsname, *px_mapx400_dnsname;
+ const gchar *px_map822_dnsname, *px_mapx400_dnsname;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
proto_tree_add_item(rr_tree, hf_dns_px_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
@@ -2470,7 +2470,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_NXT: /* Next name (30) */
{
int rr_len = data_len;
- const guchar *next_domain_name;
+ const gchar *next_domain_name;
int next_domain_name_len;
used_bytes = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
@@ -2490,7 +2490,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
guint16 priority = 0;
guint16 weight = 0;
guint16 port = 0;
- const guchar *target;
+ const gchar *target;
int target_len;
proto_tree_add_item(rr_tree, hf_dns_srv_priority, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
@@ -2527,7 +2527,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
guint8 flags_len;
guint8 service_len;
guint8 regex_len;
- const guchar *replacement;
+ const gchar *replacement;
int replacement_len;
/* Order */
@@ -2578,7 +2578,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_KX: /* Key Exchange (36) */
{
- const guchar *kx_name;
+ const gchar *kx_name;
int kx_name_len;
used_bytes = get_dns_name(tvb, cur_offset + 2, 0, dns_data_offset, &kx_name, &kx_name_len);
@@ -2618,7 +2618,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
unsigned short pre_len;
unsigned short suf_len;
unsigned short suf_octet_count;
- const guchar *pname;
+ const gchar *pname;
int pname_len;
int a6_offset;
int suf_offset;
@@ -2672,7 +2672,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_DNAME: /* Non-terminal DNS name redirection (39) */
{
- const guchar *dname;
+ const gchar *dname;
int dname_len;
used_bytes = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
@@ -2940,7 +2940,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
{
int rr_len = data_len;
guint8 gw_type;
- const guchar *gw;
+ const gchar *gw;
int gw_name_len;
proto_tree_add_item(rr_tree, hf_dns_ipseckey_gateway_precedence, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
@@ -3004,7 +3004,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_SIG: /* Security SIgnature (24) */
{
int rr_len = data_len;
- const guchar *signer_name;
+ const gchar *signer_name;
int signer_name_len;
proto_item *ti;
@@ -3052,7 +3052,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_NSEC: /* NSEC (47) */
{
int rr_len = data_len;
- const guchar *next_domain_name;
+ const gchar *next_domain_name;
int next_domain_name_len;
used_bytes = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
@@ -3200,7 +3200,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
guint16 pk_len;
int rr_len = data_len;
int rendezvous_len;
- const guchar *rend_server_dns_name;
+ const gchar *rend_server_dns_name;
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name);
@@ -3312,7 +3312,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_LP: /* Locator FQDN (107) */
{
int lp_len;
- const guchar *lp_str;
+ const gchar *lp_str;
proto_tree_add_item(rr_tree, hf_dns_ilnp_locatorfqdn_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
@@ -3340,7 +3340,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_TKEY: /* Transaction Key (249) */
{
- const guchar *tkey_algname;
+ const gchar *tkey_algname;
int tkey_algname_len;
guint16 tkey_mode, tkey_keylen, tkey_otherlen;
@@ -3425,7 +3425,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_TSIG: /* Transaction Signature (250) */
{
guint16 tsig_siglen, tsig_otherlen;
- const guchar *tsig_algname;
+ const gchar *tsig_algname;
int tsig_algname_len;
proto_item *ti;
@@ -3558,7 +3558,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case T_WINS_R: /* Microsoft's WINS-R (65282)*/
{
- const guchar *dname;
+ const gchar *dname;
int dname_len;
proto_tree_add_item(rr_tree, hf_dns_winsr_local_flag, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
@@ -3697,7 +3697,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint qtype = 0;
guint qclass = 0;
gboolean retransmission = FALSE;
- const guchar *name;
+ const gchar *name;
int name_len;
nstime_t delta = NSTIME_INIT_ZERO;
diff --git a/epan/dissectors/packet-dns.h b/epan/dissectors/packet-dns.h
index e0ea8c0897..4aeba97600 100644
--- a/epan/dissectors/packet-dns.h
+++ b/epan/dissectors/packet-dns.h
@@ -16,7 +16,7 @@
extern const value_string dns_classes[];
/* Just like expand_dns_name, but pretty-prints empty names. */
-int get_dns_name(tvbuff_t *, int, int, int, const guchar **, guint*);
+int get_dns_name(tvbuff_t *, int, int, int, const gchar **, guint*);
#define MAX_DNAME_LEN 255 /* maximum domain name length */
diff --git a/epan/dissectors/packet-gsm_gsup.c b/epan/dissectors/packet-gsm_gsup.c
index f3ce079300..50d7add060 100644
--- a/epan/dissectors/packet-gsm_gsup.c
+++ b/epan/dissectors/packet-gsm_gsup.c
@@ -675,7 +675,7 @@ dissect_gsup_tlvs(tvbuff_t *tvb, int base_offs, int length, packet_info *pinfo,
guint8 len;
proto_item *ti;
proto_tree *att_tree;
- const guchar *apn;
+ const gchar *apn;
const gchar *str;
guint apn_len;
guint32 ui32;
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 07fbfb5aae..a701098a62 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -2325,7 +2325,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
case ND_OPT_DNS_SEARCH_LIST: /* DNS Search List Option (31) */
{
int dnssl_len;
- const guchar *dnssl_name;
+ const gchar *dnssl_name;
/* Reserved */
proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA);
@@ -3496,7 +3496,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre
}
case ICMP6_NI_SUBJ_FQDN: {
int fqdn_len;
- const guchar *fqdn_name;
+ const gchar *fqdn_name;
used_bytes = get_dns_name(tvb, ni_offset, 0, ni_offset, &fqdn_name, &fqdn_len);
proto_tree_add_string(tree, hf_icmpv6_ni_query_subject_fqdn, tvb, ni_offset, used_bytes,
format_text(wmem_packet_scope(), fqdn_name, fqdn_len));
@@ -3515,7 +3515,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre
break;
case NI_QTYPE_NODENAME: {
int node_name_len;
- const guchar *node_name;
+ const gchar *node_name;
/* TTL */
proto_tree_add_item(tree, hf_icmpv6_ni_reply_node_ttl, tvb, ni_offset, 4, ENC_BIG_ENDIAN);
ni_offset += 4;
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index bb0aba6a8c..1cb3231872 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -4212,7 +4212,7 @@ static void
int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_)
{
int compr_len;
- const guchar *name;
+ const gchar *name;
guint name_len;
/* The name data MUST start at offset 0 of the tvb */
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index 42ca544e57..04ed341deb 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -465,7 +465,7 @@ static void dissect_srv_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int
guint16 /*len, namelen,*/ priority, weight, port;
guint dlen;
guint used_bytes;
- const guchar *dname;
+ const gchar *dname;
proto_item* srv_rec_tree, *rec_tree;
@@ -533,7 +533,7 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in
guint priority;
guint dlen;
guint used_bytes;
- const guchar *dname;
+ const gchar *dname;
proto_tree* mx_rec_tree, *rec_tree;
@@ -581,7 +581,7 @@ static void dissect_ns_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in
{
guint i, curr;
guint dlen;
- const guchar *dname;
+ const gchar *dname;
guint used_bytes;
proto_tree* ns_rec_tree, *rec_tree;
diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c
index e62b198003..35c1340112 100644
--- a/epan/dissectors/packet-nbt.c
+++ b/epan/dissectors/packet-nbt.c
@@ -327,10 +327,10 @@ get_nbns_name(tvbuff_t *tvb, int offset, int nbns_data_offset,
char *name_ret, int name_ret_len, int *name_type_ret)
{
int name_len;
- const guchar *name;
- const guchar *nbname;
+ const gchar *name;
+ const gchar *nbname;
char *nbname_buf;
- const guchar *pname;
+ const gchar *pname;
char cname, cnbname;
int name_type;
char *pname_ret;
diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c
index f16891c85f..f43aa053e4 100644
--- a/epan/dissectors/packet-smb-common.c
+++ b/epan/dissectors/packet-smb-common.c
@@ -115,7 +115,7 @@ int dissect_ms_compressed_string(tvbuff_t *tvb, proto_tree *tree, int offset, in
{
int compr_len;
guint str_len;
- const guchar *str = NULL;
+ const gchar *str = NULL;
/* The name data MUST start at offset 0 of the tvb */
compr_len = get_dns_name(tvb, offset, MAX_UNICODE_STR_LEN+3+1, 0, &str, &str_len);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 10:23:09 +0000