summaryrefslogtreecommitdiffstats
path: root/epan/iana_charsets.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
commit9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch)
tree2784370cda9bbf2da9114d70f05399c0b229d28c /epan/iana_charsets.c
parentAdding debian version 4.2.6-1. (diff)
downloadwireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz
wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/iana_charsets.c')
-rw-r--r--epan/iana_charsets.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/iana_charsets.c b/epan/iana_charsets.c
index 600339cd..5efed6ff 100644
--- a/epan/iana_charsets.c
+++ b/epan/iana_charsets.c
@@ -30,8 +30,8 @@
/*
* Map a MIBenum code for a charset to a Wireshark string encoding.
*/
-guint
-mibenum_charset_to_encoding (guint charset)
+unsigned
+mibenum_charset_to_encoding (unsigned charset)
{
switch (charset) {
/* Expand macro result in: