summaryrefslogtreecommitdiffstats
path: root/epan/dvb_chartbl.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dvb_chartbl.h
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz
wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dvb_chartbl.h')
-rw-r--r--epan/dvb_chartbl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dvb_chartbl.h b/epan/dvb_chartbl.h
index 18e0d48d..4092f48f 100644
--- a/epan/dvb_chartbl.h
+++ b/epan/dvb_chartbl.h
@@ -52,15 +52,15 @@ typedef enum {
} dvb_encoding_e;
WS_DLL_PUBLIC
-guint dvb_analyze_string_charset(tvbuff_t *tvb, int offset, int length,
+unsigned dvb_analyze_string_charset(tvbuff_t *tvb, int offset, int length,
dvb_encoding_e *encoding);
WS_DLL_PUBLIC
-guint dvb_enc_to_item_enc(dvb_encoding_e encoding);
+unsigned dvb_enc_to_item_enc(dvb_encoding_e encoding);
WS_DLL_PUBLIC
void dvb_add_chartbl(proto_tree *tree, int hf,
- tvbuff_t *tvb, gint offset, gint length,
+ tvbuff_t *tvb, int offset, int length,
dvb_encoding_e encoding);
#ifdef __cplusplus