From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-smb-common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-smb-common.c') diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c index 9cc72c58..92d100ae 100644 --- a/epan/dissectors/packet-smb-common.c +++ b/epan/dissectors/packet-smb-common.c @@ -44,7 +44,7 @@ const value_string share_type_vals[] = { int display_ms_string(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int hf_index, char **data) { char *str; - gint len; + int len; /* display a string from the tree and return the new offset */ @@ -85,8 +85,8 @@ int dissect_ms_compressed_string(tvbuff_t *tvb, packet_info *pinfo, proto_tree * const char **data) { int compr_len; - gint str_len; - const gchar *str = NULL; + int str_len; + const char *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); -- cgit v1.2.3