From efc336e60cf1331bf5f3213d296981b87b8b2a6c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 4 Jun 2023 19:24:05 +0300 Subject: =?UTF-8?q?fixes=20#3537=20(Telegram:=2032-=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D1=80=D1=8F=D0=B4=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=B4=D0=B0=D0=B5=D1=82=20=D0=B2=20?= =?UTF-8?q?64-=D1=80=D0=B0=D0=B7=D1=80=D1=8F=D0=B4=D0=BD=D0=BE=D0=B9=20Win?= =?UTF-8?q?dows)=20+=20update=20to=20the=20fresh=20TDLIB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tdutils/generate/auto/extension_to_mime_type.cpp | 19 +++++++++++-------- .../tdutils/generate/auto/mime_type_to_extension.cpp | 19 +++++++++++-------- .../td/tdutils/generate/generate_mime_types_gperf.cpp | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) (limited to 'protocols/Telegram/tdlib/td/tdutils/generate') diff --git a/protocols/Telegram/tdlib/td/tdutils/generate/auto/extension_to_mime_type.cpp b/protocols/Telegram/tdlib/td/tdutils/generate/auto/extension_to_mime_type.cpp index 5b924aa371..809b73df27 100644 --- a/protocols/Telegram/tdlib/td/tdutils/generate/auto/extension_to_mime_type.cpp +++ b/protocols/Telegram/tdlib/td/tdutils/generate/auto/extension_to_mime_type.cpp @@ -1,5 +1,5 @@ -/* ANSI-C code produced by gperf version 3.1 */ -/* Command-line: 'W:\\Test\\td\\vcpkg\\installed\\x64-windows\\tools\\gperf.exe' -m100 --output-file=auto/extension_to_mime_type.cpp auto/extension_to_mime_type.gperf */ +/* ANSI-C code produced by gperf version 3.0.1 */ +/* Command-line: 'C:\\Util\\gperf.exe' -m100 --output-file=auto/extension_to_mime_type.cpp auto/extension_to_mime_type.gperf */ /* Computed positions: -k'1-4,6,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -26,7 +26,7 @@ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) /* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." #endif #line 12 "auto/extension_to_mime_type.gperf" @@ -86,7 +86,7 @@ inline #endif #endif static unsigned int -extension_hash (register const char *str, register size_t len) +extension_hash (register const char *str, register unsigned int len) { static const unsigned short asso_values[] = { @@ -122,7 +122,7 @@ extension_hash (register const char *str, register size_t len) 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376, 3376 }; - register unsigned int hval = len; + register int hval = len; switch (hval) { @@ -146,8 +146,11 @@ extension_hash (register const char *str, register size_t len) return hval + asso_values[(unsigned char)str[len - 1]]; } +#ifdef __GNUC__ +__inline +#endif const struct extension_and_mime_type * -search_extension (register const char *str, register size_t len) +search_extension (register const char *str, register unsigned int len) { enum { @@ -3033,9 +3036,9 @@ search_extension (register const char *str, register size_t len) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { - register unsigned int key = extension_hash (str, len); + register int key = extension_hash (str, len); - if (key <= MAX_HASH_VALUE) + if (key <= MAX_HASH_VALUE && key >= 0) { register const char *s = wordlist[key].extension; diff --git a/protocols/Telegram/tdlib/td/tdutils/generate/auto/mime_type_to_extension.cpp b/protocols/Telegram/tdlib/td/tdutils/generate/auto/mime_type_to_extension.cpp index 77af524d83..c2e8686590 100644 --- a/protocols/Telegram/tdlib/td/tdutils/generate/auto/mime_type_to_extension.cpp +++ b/protocols/Telegram/tdlib/td/tdutils/generate/auto/mime_type_to_extension.cpp @@ -1,5 +1,5 @@ -/* ANSI-C code produced by gperf version 3.1 */ -/* Command-line: 'W:\\Test\\td\\vcpkg\\installed\\x64-windows\\tools\\gperf.exe' -m100 --output-file=auto/mime_type_to_extension.cpp auto/mime_type_to_extension.gperf */ +/* ANSI-C code produced by gperf version 3.0.1 */ +/* Command-line: 'C:\\Util\\gperf.exe' -m100 --output-file=auto/mime_type_to_extension.cpp auto/mime_type_to_extension.gperf */ /* Computed positions: -k'1,6-7,9-10,13-18,20,23,25-26,31,36,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -26,7 +26,7 @@ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) /* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#error "gperf generated tables don't work with this execution character set. Please report a bug to ." #endif #line 12 "auto/mime_type_to_extension.gperf" @@ -86,7 +86,7 @@ inline #endif #endif static unsigned int -mime_type_hash (register const char *str, register size_t len) +mime_type_hash (register const char *str, register unsigned int len) { static const unsigned short asso_values[] = { @@ -117,7 +117,7 @@ mime_type_hash (register const char *str, register size_t len) 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686, 4686 }; - register unsigned int hval = len; + register int hval = len; switch (hval) { @@ -195,8 +195,11 @@ mime_type_hash (register const char *str, register size_t len) return hval + asso_values[(unsigned char)str[len - 1]]; } +#ifdef __GNUC__ +__inline +#endif const struct mime_type_and_extension * -search_mime_type (register const char *str, register size_t len) +search_mime_type (register const char *str, register unsigned int len) { enum { @@ -3007,9 +3010,9 @@ search_mime_type (register const char *str, register size_t len) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { - register unsigned int key = mime_type_hash (str, len); + register int key = mime_type_hash (str, len); - if (key <= MAX_HASH_VALUE) + if (key <= MAX_HASH_VALUE && key >= 0) { register const char *s = wordlist[key].mime_type; diff --git a/protocols/Telegram/tdlib/td/tdutils/generate/generate_mime_types_gperf.cpp b/protocols/Telegram/tdlib/td/tdutils/generate/generate_mime_types_gperf.cpp index 44ab2bd1e9..8a41633a40 100644 --- a/protocols/Telegram/tdlib/td/tdutils/generate/generate_mime_types_gperf.cpp +++ b/protocols/Telegram/tdlib/td/tdutils/generate/generate_mime_types_gperf.cpp @@ -1,5 +1,5 @@ // -// Copyright Aliaksei Levin (levlam@telegram.org), Arseny Smirnov (arseny30@gmail.com) 2014-2022 +// Copyright Aliaksei Levin (levlam@telegram.org), Arseny Smirnov (arseny30@gmail.com) 2014-2023 // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -- cgit v1.2.3