aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvorkanton <dvorkanton@yandex-team.ru>2022-02-10 16:46:04 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:04 +0300
commitce1ca0f8ad5b8231d32b35629f85bb09beea1bfb (patch)
tree19b21fdcf9ef01e0c94a15434fb08a4a555a79e9
parentfc361854fd6ee8d747229b090f0b8018e260d1fb (diff)
downloadydb-ce1ca0f8ad5b8231d32b35629f85bb09beea1bfb.tar.gz
Restoring authorship annotation for <dvorkanton@yandex-team.ru>. Commit 1 of 2.
-rw-r--r--build/sysincl/android.yml4
-rw-r--r--build/ymake.core.conf20
-rw-r--r--contrib/libs/crcutil/ya.make14
-rw-r--r--contrib/libs/grpc/src/core/ext/filters/http/http_filters_plugin.cc4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc2
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc8
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/http2_settings.h8
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/huffsyms.h4
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/internal.h28
-rw-r--r--contrib/libs/grpc/src/core/ext/transport/chttp2/transport/stream_map.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/channel/channel_stack.h16
-rw-r--r--contrib/libs/grpc/src/core/lib/channel/connected_channel.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/channel/status_util.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/gpr/spinlock.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/http/httpcli.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/http/httpcli.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/http/httpcli_security_connector.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/http/parser.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/closure.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/endpoint_cfstream.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/endpoint_pair.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/error.cc12
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/ev_epollex_linux.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/ev_posix.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/resolve_address.h8
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/resolve_address_posix.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/resolve_address_windows.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/resource_quota.cc8
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/socket_factory_posix.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/socket_mutator.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/tcp_client_windows.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/tcp_custom.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/time_averaged_stats.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/timer_generic.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/iomgr/timer_heap.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/credentials/credentials.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/credentials/jwt/json_token.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.h8
-rw-r--r--contrib/libs/grpc/src/core/lib/slice/slice_intern.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/surface/call.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/surface/channel_ping.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/surface/completion_queue.cc16
-rw-r--r--contrib/libs/grpc/src/core/lib/transport/metadata_batch.h4
-rw-r--r--contrib/libs/grpc/src/core/lib/transport/transport.cc4
-rw-r--r--contrib/libs/grpc/src/core/lib/uri/uri_parser.h4
-rw-r--r--contrib/libs/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h4
-rw-r--r--contrib/libs/grpc/src/core/tsi/fake_transport_security.cc20
-rw-r--r--contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc12
-rw-r--r--contrib/libs/grpc/src/core/tsi/ssl_transport_security.h8
-rw-r--r--contrib/libs/grpc/src/core/tsi/transport_security.h12
-rw-r--r--contrib/libs/grpc/src/core/tsi/transport_security_grpc.h4
-rw-r--r--contrib/libs/grpc/src/core/tsi/transport_security_interface.h4
-rw-r--r--contrib/libs/libbz2/CHANGES712
-rw-r--r--contrib/libs/libbz2/LICENSE6
-rw-r--r--contrib/libs/libbz2/README20
-rw-r--r--contrib/libs/libbz2/README.COMPILATION.PROBLEMS116
-rw-r--r--contrib/libs/libbz2/README.XML.STUFF4
-rw-r--r--contrib/libs/libbz2/blocksort.c10
-rw-r--r--contrib/libs/libbz2/bzlib.c8
-rw-r--r--contrib/libs/libbz2/bzlib.h4
-rw-r--r--contrib/libs/libbz2/bzlib_private.h6
-rw-r--r--contrib/libs/libbz2/compress.c6
-rw-r--r--contrib/libs/libbz2/crctable.c4
-rw-r--r--contrib/libs/libbz2/decompress.c22
-rw-r--r--contrib/libs/libbz2/huffman.c4
-rw-r--r--contrib/libs/libbz2/randtable.c4
-rw-r--r--contrib/libs/libbz2/ya.make2
-rw-r--r--contrib/libs/libiconv/aliases_nocjk.gperf528
-rw-r--r--contrib/libs/libiconv/aliases_nocjk.h2544
-rw-r--r--contrib/libs/libiconv/canonical_local_nocjk.h4
-rw-r--r--contrib/libs/libiconv/canonical_nocjk.h156
-rw-r--r--contrib/libs/libiconv/converters.h6
-rw-r--r--contrib/libs/libiconv/encodings.def2
-rwxr-xr-xcontrib/libs/libiconv/gencanonical.sh14
-rw-r--r--contrib/libs/libiconv/iconv.c6
-rw-r--r--contrib/libs/ya.make6
-rw-r--r--contrib/restricted/ya.make8
-rw-r--r--contrib/tools/ya.make2
-rw-r--r--library/cpp/blockcodecs/README.md8
-rw-r--r--library/cpp/blockcodecs/codecs.cpp2
-rw-r--r--library/cpp/blockcodecs/codecs.h4
-rw-r--r--library/cpp/blockcodecs/codecs/brotli/brotli.cpp122
-rw-r--r--library/cpp/blockcodecs/codecs/brotli/ya.make28
-rw-r--r--library/cpp/blockcodecs/codecs/bzip/bzip.cpp114
-rw-r--r--library/cpp/blockcodecs/codecs/bzip/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp96
-rw-r--r--library/cpp/blockcodecs/codecs/fastlz/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/legacy_zstd06/legacy_zstd06.cpp10
-rw-r--r--library/cpp/blockcodecs/codecs/legacy_zstd06/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/lz4/lz4.cpp226
-rw-r--r--library/cpp/blockcodecs/codecs/lz4/ya.make28
-rw-r--r--library/cpp/blockcodecs/codecs/lzma/lzma.cpp136
-rw-r--r--library/cpp/blockcodecs/codecs/lzma/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/snappy/snappy.cpp94
-rw-r--r--library/cpp/blockcodecs/codecs/snappy/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/zlib/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/zlib/zlib.cpp118
-rw-r--r--library/cpp/blockcodecs/codecs/zstd/ya.make26
-rw-r--r--library/cpp/blockcodecs/codecs/zstd/zstd.cpp102
-rw-r--r--library/cpp/blockcodecs/codecs_ut.cpp70
-rw-r--r--library/cpp/blockcodecs/core/codecs.cpp28
-rw-r--r--library/cpp/blockcodecs/core/codecs.h4
-rw-r--r--library/cpp/blockcodecs/core/register.h20
-rw-r--r--library/cpp/blockcodecs/stream.cpp2
-rw-r--r--library/cpp/blockcodecs/stream.h4
-rw-r--r--library/cpp/blockcodecs/ya.make26
-rw-r--r--library/cpp/string_utils/levenshtein_diff/levenshtein_diff.cpp2
-rw-r--r--library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h6
-rw-r--r--library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp84
-rw-r--r--library/cpp/string_utils/levenshtein_diff/ut/ya.make4
-rw-r--r--library/cpp/string_utils/levenshtein_diff/ya.make2
-rw-r--r--library/cpp/string_utils/ya.make4
-rw-r--r--library/cpp/yson_pull/detail/lexer_base.h12
-rw-r--r--util/generic/vector.h2
-rw-r--r--util/generic/vector_ut.cpp34
-rw-r--r--util/system/atomic_win.h2
-rw-r--r--util/system/fs.cpp2
-rw-r--r--ydb/library/yql/ast/yql_expr.h4
-rw-r--r--ydb/library/yql/providers/common/config/ya.make2
-rw-r--r--ydb/library/yql/providers/common/config/yql_dispatch.cpp6
-rw-r--r--ydb/library/yql/sql/v0/node.h2
-rw-r--r--ydb/library/yql/sql/v1/node.h2
-rw-r--r--ydb/library/yql/udfs/common/string/string_udf.cpp4
-rw-r--r--ydb/library/yql/udfs/common/string/ya.make2
139 files changed, 3104 insertions, 3104 deletions
diff --git a/build/sysincl/android.yml b/build/sysincl/android.yml
index 97cfbf38d2..ebae17367b 100644
--- a/build/sysincl/android.yml
+++ b/build/sysincl/android.yml
@@ -1,7 +1,7 @@
- includes:
- android/asset_manager.h
- android/asset_manager_jni.h
- - android/dlext.h
+ - android/dlext.h
- android/log.h
- android/native_window_jni.h
- cpu-features.h: contrib/libs/android_cpufeatures/cpu-features.h
@@ -19,7 +19,7 @@
- SLES/OpenSLES_AndroidConfiguration.h
- SLES/OpenSLES_AndroidMetadata.h
- SLES/OpenSLES_Platform.h
- - linux/ashmem.h
+ - linux/ashmem.h
- source_filter: "^contrib/libs/breakpad/src"
includes:
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 081833998b..70df0cc881 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -907,26 +907,26 @@ macro _PY_PROTO_CMD_INTERNAL(File) {
}
# tag:proto tag:java-specific
-JAVA_PROTO_RUNTIME=
+JAVA_PROTO_RUNTIME=
# tag:proto tag:java-specific
-### @usage: USE_JAVALITE()
-### Use protobuf-javalite for Java
+### @usage: USE_JAVALITE()
+### Use protobuf-javalite for Java
macro USE_JAVALITE() {
- SET(JAVA_PROTO_RUNTIME javalite)
+ SET(JAVA_PROTO_RUNTIME javalite)
}
# tag:proto tag:java-specific
JAVA_PROTO_RUNTIME_VERSION = 3.18.2
JAVA_PROTO_COMMON_VERSION = 1.12.0
-when ($JAVA_PROTO_RUNTIME == "javalite") {
- _JAVA_PROTO_OUT_ARG=--java_out=lite:
+when ($JAVA_PROTO_RUNTIME == "javalite") {
+ _JAVA_PROTO_OUT_ARG=--java_out=lite:
JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION}
- JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0
- JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0
-}
+ JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0
+ JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0
+}
otherwise {
- _JAVA_PROTO_OUT_ARG=--java_out=
+ _JAVA_PROTO_OUT_ARG=--java_out=
JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION}
JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.26.0
JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.26.0
diff --git a/contrib/libs/crcutil/ya.make b/contrib/libs/crcutil/ya.make
index 2da8ef940f..e3de9428f1 100644
--- a/contrib/libs/crcutil/ya.make
+++ b/contrib/libs/crcutil/ya.make
@@ -22,13 +22,13 @@ IF (GCC AND USE_LTO)
ENDIF()
IF (ARCH_I386 OR ARCH_X86_64)
- IF (OS_WINDOWS)
+ IF (OS_WINDOWS)
SRCS(
multiword_64_64_cl_i386_mmx.cc
)
ELSEIF (OS_ANDROID AND ARCH_I386)
- # 32-bit Android has some problems with register allocation, so we fall back to default implementation
- ELSE()
+ # 32-bit Android has some problems with register allocation, so we fall back to default implementation
+ ELSE()
IF (CLANG)
CFLAGS(-DCRCUTIL_USE_MM_CRC32=1)
IF (ARCH_I386)
@@ -53,13 +53,13 @@ IF (ARCH_I386 OR ARCH_X86_64)
multiword_64_64_gcc_amd64_asm.cc
)
ENDIF()
- IF (OS_WINDOWS)
+ IF (OS_WINDOWS)
SRCS(
crc32c_sse4.cc
)
- ELSE()
- SRC_CPP_SSE4(crc32c_sse4.cc)
- ENDIF()
+ ELSE()
+ SRC_CPP_SSE4(crc32c_sse4.cc)
+ ENDIF()
ENDIF()
SRCS(
diff --git a/contrib/libs/grpc/src/core/ext/filters/http/http_filters_plugin.cc b/contrib/libs/grpc/src/core/ext/filters/http/http_filters_plugin.cc
index 637dc3030f..c77c427159 100644
--- a/contrib/libs/grpc/src/core/ext/filters/http/http_filters_plugin.cc
+++ b/contrib/libs/grpc/src/core/ext/filters/http/http_filters_plugin.cc
@@ -29,10 +29,10 @@
#include "src/core/lib/surface/channel_init.h"
#include "src/core/lib/transport/transport_impl.h"
-struct optional_filter {
+struct optional_filter {
const grpc_channel_filter* filter;
const char* control_channel_arg;
-};
+};
static optional_filter compress_filter = {
&grpc_message_compress_filter, GRPC_ARG_ENABLE_PER_MESSAGE_COMPRESSION};
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc b/contrib/libs/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc
index 94cf61310b..6eccb3f08d 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -125,7 +125,7 @@ class Chttp2ServerListener : public Server::ListenerInterface {
grpc_closure* on_destroy_done_ = nullptr;
HandshakeManager* pending_handshake_mgrs_ = nullptr;
RefCountedPtr<channelz::ListenSocketNode> channelz_listen_socket_;
-};
+};
//
// Chttp2ServerListener::ConnectionState
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc
index ba39bbdbe3..d990147efa 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/bin_encoder.cc
@@ -28,10 +28,10 @@
static const char alphabet[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-struct b64_huff_sym {
+struct b64_huff_sym {
uint16_t bits;
uint8_t length;
-};
+};
static const b64_huff_sym huff_alphabet[64] = {
{0x21, 6}, {0x5d, 7}, {0x5e, 7}, {0x5f, 7}, {0x60, 7}, {0x61, 7},
{0x62, 7}, {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, {0x67, 7},
@@ -135,11 +135,11 @@ grpc_slice grpc_chttp2_huffman_compress(const grpc_slice& input) {
return output;
}
-struct huff_out {
+struct huff_out {
uint32_t temp;
uint32_t temp_length;
uint8_t* out;
-};
+};
static void enc_flush_some(huff_out* out) {
while (out->temp_length > 8) {
out->temp_length -= 8;
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 180ca62543..802fccfdfc 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -2373,10 +2373,10 @@ static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s,
grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API);
}
-struct cancel_stream_cb_args {
+struct cancel_stream_cb_args {
grpc_error* error;
grpc_chttp2_transport* t;
-};
+};
static void cancel_stream_cb(void* user_data, uint32_t /*key*/, void* stream) {
cancel_stream_cb_args* args = static_cast<cancel_stream_cb_args*>(user_data);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h
index df6274d628..21835e9c49 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h
@@ -37,14 +37,14 @@ typedef enum {
GRPC_CHTTP2_GOAWAY_DEBUG
} grpc_chttp2_goaway_parse_state;
-struct grpc_chttp2_goaway_parser {
+struct grpc_chttp2_goaway_parser {
grpc_chttp2_goaway_parse_state state;
uint32_t last_stream_id;
uint32_t error_code;
char* debug_data;
uint32_t debug_length;
uint32_t debug_pos;
-};
+};
void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p);
void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser* p);
grpc_error* grpc_chttp2_goaway_parser_begin_frame(
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h
index e356bf43f0..f6746fba40 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h
@@ -24,11 +24,11 @@
#include <grpc/slice.h>
#include "src/core/ext/transport/chttp2/transport/frame.h"
-struct grpc_chttp2_ping_parser {
+struct grpc_chttp2_ping_parser {
uint8_t byte;
uint8_t is_ack;
uint64_t opaque_8bytes;
-};
+};
grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes);
grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser,
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
index e324ee2cfc..57b77ab3fe 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
@@ -25,10 +25,10 @@
#include "src/core/ext/transport/chttp2/transport/frame.h"
#include "src/core/lib/transport/transport.h"
-struct grpc_chttp2_rst_stream_parser {
+struct grpc_chttp2_rst_stream_parser {
uint8_t byte;
uint8_t reason_bytes[4];
-};
+};
grpc_slice grpc_chttp2_rst_stream_create(uint32_t stream_id, uint32_t code,
grpc_transport_one_way_stats* stats);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h
index 181471401c..81a16bfbe1 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h
@@ -34,14 +34,14 @@ typedef enum {
GRPC_CHTTP2_SPS_VAL3
} grpc_chttp2_settings_parse_state;
-struct grpc_chttp2_settings_parser {
+struct grpc_chttp2_settings_parser {
grpc_chttp2_settings_parse_state state;
uint32_t* target_settings;
uint8_t is_ack;
uint16_t id;
uint32_t value;
uint32_t incoming_settings[GRPC_CHTTP2_NUM_SETTINGS];
-};
+};
/* Create a settings frame by diffing old & new, and updating old to be new */
grpc_slice grpc_chttp2_settings_create(uint32_t* old, const uint32_t* newval,
uint32_t force_mask, size_t count);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h
index 340445d87a..2ee0447213 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h
@@ -25,11 +25,11 @@
#include "src/core/ext/transport/chttp2/transport/frame.h"
#include "src/core/lib/transport/transport.h"
-struct grpc_chttp2_window_update_parser {
+struct grpc_chttp2_window_update_parser {
uint8_t byte;
uint8_t is_connection_update;
uint32_t amount;
-};
+};
grpc_slice grpc_chttp2_window_update_create(
uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
index 4ceaec24b3..fdc7a90012 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
@@ -259,7 +259,7 @@ static bool CanAddToHashtable(grpc_chttp2_hpack_compressor* hpack_compressor,
}
} /* namespace */
-struct framer_state {
+struct framer_state {
int is_first_frame;
/* number of bytes in 'output' when we started the frame - used to calculate
frame length */
@@ -278,7 +278,7 @@ struct framer_state {
size_t max_frame_size;
bool use_true_binary_metadata;
bool is_end_of_stream;
-};
+};
/* fills p (which is expected to be kDataFrameHeaderSize bytes long)
* with a data frame header */
static void fill_header(uint8_t* p, uint8_t type, uint32_t id, size_t len,
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h
index 5093f80ae2..aa6d08655e 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.h
@@ -90,13 +90,13 @@ void grpc_chttp2_hpack_compressor_set_max_table_size(
void grpc_chttp2_hpack_compressor_set_max_usable_size(
grpc_chttp2_hpack_compressor* c, uint32_t max_table_size);
-struct grpc_encode_header_options {
+struct grpc_encode_header_options {
uint32_t stream_id;
bool is_eof;
bool use_true_binary_metadata;
size_t max_frame_size;
grpc_transport_one_way_stats* stats;
-};
+};
void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c,
grpc_mdelem** extra_headers,
size_t extra_headers_size,
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h
index 1b859c4d7c..6685293a68 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h
@@ -32,7 +32,7 @@ typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser;
typedef grpc_error* (*grpc_chttp2_hpack_parser_state)(
grpc_chttp2_hpack_parser* p, const uint8_t* beg, const uint8_t* end);
-struct grpc_chttp2_hpack_parser_string {
+struct grpc_chttp2_hpack_parser_string {
bool copied;
struct {
grpc_slice referenced;
@@ -42,7 +42,7 @@ struct grpc_chttp2_hpack_parser_string {
uint32_t capacity;
} copied;
} data;
-};
+};
struct grpc_chttp2_hpack_parser {
/* user specified callback for each header output */
grpc_error* (*on_header)(void* user_data, grpc_mdelem md);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h
index 34c3dceda7..99cdbad608 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h
@@ -138,10 +138,10 @@ inline uintptr_t grpc_chttp2_get_static_hpack_table_index(grpc_mdelem md) {
/* Find a key/value pair in the table... returns the index in the table of the
most similar entry, or 0 if the value was not found */
-struct grpc_chttp2_hptbl_find_result {
+struct grpc_chttp2_hptbl_find_result {
uint32_t index;
int has_value;
-};
+};
grpc_chttp2_hptbl_find_result grpc_chttp2_hptbl_find(
const grpc_chttp2_hptbl* tbl, grpc_mdelem md);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/http2_settings.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/http2_settings.h
index 3e8ead60f4..ca07b9569c 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/http2_settings.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/http2_settings.h
@@ -26,7 +26,7 @@
#include <stdbool.h>
#include <stdint.h>
-enum grpc_chttp2_setting_id {
+enum grpc_chttp2_setting_id {
GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE = 0, /* wire id 1 */
GRPC_CHTTP2_SETTINGS_ENABLE_PUSH = 1, /* wire id 2 */
GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 2, /* wire id 3 */
@@ -34,7 +34,7 @@ enum grpc_chttp2_setting_id {
GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE = 4, /* wire id 5 */
GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 5, /* wire id 6 */
GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA = 6, /* wire id 65027 */
-};
+};
#define GRPC_CHTTP2_NUM_SETTINGS 7
@@ -47,14 +47,14 @@ typedef enum {
GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE
} grpc_chttp2_invalid_value_behavior;
-struct grpc_chttp2_setting_parameters {
+struct grpc_chttp2_setting_parameters {
const char* name;
uint32_t default_value;
uint32_t min_value;
uint32_t max_value;
grpc_chttp2_invalid_value_behavior invalid_value_behavior;
uint32_t error_value;
-};
+};
extern const grpc_chttp2_setting_parameters
grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS];
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/huffsyms.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/huffsyms.h
index 49feb238f1..057e418eda 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/huffsyms.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/huffsyms.h
@@ -23,10 +23,10 @@
#define GRPC_CHTTP2_NUM_HUFFSYMS 257
-struct grpc_chttp2_huffsym {
+struct grpc_chttp2_huffsym {
unsigned bits;
unsigned length;
-};
+};
extern const grpc_chttp2_huffsym grpc_chttp2_huffsyms[GRPC_CHTTP2_NUM_HUFFSYMS];
#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HUFFSYMS_H */
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/internal.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/internal.h
index 2f028c08f3..93f6f35036 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/internal.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/internal.h
@@ -111,26 +111,26 @@ typedef enum {
const char* grpc_chttp2_initiate_write_reason_string(
grpc_chttp2_initiate_write_reason reason);
-struct grpc_chttp2_ping_queue {
+struct grpc_chttp2_ping_queue {
grpc_closure_list lists[GRPC_CHTTP2_PCL_COUNT] = {};
uint64_t inflight_id = 0;
-};
-struct grpc_chttp2_repeated_ping_policy {
+};
+struct grpc_chttp2_repeated_ping_policy {
int max_pings_without_data;
int max_ping_strikes;
grpc_millis min_sent_ping_interval_without_data;
grpc_millis min_recv_ping_interval_without_data;
-};
-struct grpc_chttp2_repeated_ping_state {
+};
+struct grpc_chttp2_repeated_ping_state {
grpc_millis last_ping_sent_time;
int pings_before_data_required;
grpc_timer delayed_ping_timer;
bool is_delayed_ping_timer_set;
-};
-struct grpc_chttp2_server_ping_recv_state {
+};
+struct grpc_chttp2_server_ping_recv_state {
grpc_millis last_ping_recv_time;
int ping_strikes;
-};
+};
/* deframer state for the overall http2 stream of bytes */
typedef enum {
/* prefix: one entry per http2 connection prefix byte */
@@ -174,14 +174,14 @@ typedef enum {
GRPC_DTS_FRAME
} grpc_chttp2_deframe_transport_state;
-struct grpc_chttp2_stream_list {
+struct grpc_chttp2_stream_list {
grpc_chttp2_stream* head;
grpc_chttp2_stream* tail;
-};
-struct grpc_chttp2_stream_link {
+};
+struct grpc_chttp2_stream_link {
grpc_chttp2_stream* next;
grpc_chttp2_stream* prev;
-};
+};
/* We keep several sets of connection wide parameters */
typedef enum {
/* The settings our peer has asked for (and we have acked) */
@@ -686,14 +686,14 @@ struct grpc_chttp2_stream {
void grpc_chttp2_initiate_write(grpc_chttp2_transport* t,
grpc_chttp2_initiate_write_reason reason);
-struct grpc_chttp2_begin_write_result {
+struct grpc_chttp2_begin_write_result {
/** are we writing? */
bool writing;
/** if writing: was it a complete flush (false) or a partial flush (true) */
bool partial;
/** did we queue any completions as part of beginning the write */
bool early_results_scheduled;
-};
+};
grpc_chttp2_begin_write_result grpc_chttp2_begin_write(
grpc_chttp2_transport* t);
void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error);
diff --git a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/stream_map.h b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/stream_map.h
index 485abd2d13..ae658bbb0a 100644
--- a/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/stream_map.h
+++ b/contrib/libs/grpc/src/core/ext/transport/chttp2/transport/stream_map.h
@@ -29,13 +29,13 @@
Lookups are performed with binary search.
Adds are restricted to strictly higher keys than previously seen (this is
guaranteed by http2). */
-struct grpc_chttp2_stream_map {
+struct grpc_chttp2_stream_map {
uint32_t* keys;
void** values;
size_t count;
size_t free;
size_t capacity;
-};
+};
void grpc_chttp2_stream_map_init(grpc_chttp2_stream_map* map,
size_t initial_capacity);
void grpc_chttp2_stream_map_destroy(grpc_chttp2_stream_map* map);
diff --git a/contrib/libs/grpc/src/core/lib/channel/channel_stack.h b/contrib/libs/grpc/src/core/lib/channel/channel_stack.h
index e297df9488..6ac5e09660 100644
--- a/contrib/libs/grpc/src/core/lib/channel/channel_stack.h
+++ b/contrib/libs/grpc/src/core/lib/channel/channel_stack.h
@@ -65,15 +65,15 @@ typedef struct grpc_call_element grpc_call_element;
typedef struct grpc_channel_stack grpc_channel_stack;
typedef struct grpc_call_stack grpc_call_stack;
-struct grpc_channel_element_args {
+struct grpc_channel_element_args {
grpc_channel_stack* channel_stack;
const grpc_channel_args* channel_args;
/** Transport, iff it is known */
grpc_transport* optional_transport;
int is_first;
int is_last;
-};
-struct grpc_call_element_args {
+};
+struct grpc_call_element_args {
grpc_call_stack* call_stack;
const void* server_transport_data;
grpc_call_context_element* context;
@@ -82,11 +82,11 @@ struct grpc_call_element_args {
grpc_millis deadline;
grpc_core::Arena* arena;
grpc_core::CallCombiner* call_combiner;
-};
-struct grpc_call_stats {
+};
+struct grpc_call_stats {
grpc_transport_stream_stats transport_stream_stats;
gpr_timespec latency; /* From call creating to enqueing of received status */
-};
+};
/** Information about the call upon completion. */
struct grpc_call_final_info {
grpc_call_stats stats;
@@ -104,7 +104,7 @@ struct grpc_call_final_info {
4. a name, which is useful when debugging
Members are laid out in approximate frequency of use order. */
-struct grpc_channel_filter {
+struct grpc_channel_filter {
/* Called to eg. send/receive data on a call.
See grpc_call_next_op on how to call the next element in the stack */
void (*start_transport_stream_op_batch)(grpc_call_element* elem,
@@ -160,7 +160,7 @@ struct grpc_channel_filter {
/* The name of this filter */
const char* name;
-};
+};
/* A channel_element tracks its filter and the filter requested memory within
a channel allocation */
struct grpc_channel_element {
diff --git a/contrib/libs/grpc/src/core/lib/channel/connected_channel.cc b/contrib/libs/grpc/src/core/lib/channel/connected_channel.cc
index be74d9e88b..e86b3e639c 100644
--- a/contrib/libs/grpc/src/core/lib/channel/connected_channel.cc
+++ b/contrib/libs/grpc/src/core/lib/channel/connected_channel.cc
@@ -38,12 +38,12 @@ typedef struct connected_channel_channel_data {
grpc_transport* transport;
} channel_data;
-struct callback_state {
+struct callback_state {
grpc_closure closure;
grpc_closure* original_closure;
grpc_core::CallCombiner* call_combiner;
const char* reason;
-};
+};
typedef struct connected_channel_call_data {
grpc_core::CallCombiner* call_combiner;
// Closures used for returning results on the call combiner.
diff --git a/contrib/libs/grpc/src/core/lib/channel/status_util.cc b/contrib/libs/grpc/src/core/lib/channel/status_util.cc
index 39f310a165..20faaa92a3 100644
--- a/contrib/libs/grpc/src/core/lib/channel/status_util.cc
+++ b/contrib/libs/grpc/src/core/lib/channel/status_util.cc
@@ -22,10 +22,10 @@
#include "src/core/lib/gpr/useful.h"
-struct status_string_entry {
+struct status_string_entry {
const char* str;
grpc_status_code status;
-};
+};
static const status_string_entry g_status_string_entries[] = {
{"OK", GRPC_STATUS_OK},
{"CANCELLED", GRPC_STATUS_CANCELLED},
diff --git a/contrib/libs/grpc/src/core/lib/gpr/spinlock.h b/contrib/libs/grpc/src/core/lib/gpr/spinlock.h
index a9c0e62d92..fd5c1e7e74 100644
--- a/contrib/libs/grpc/src/core/lib/gpr/spinlock.h
+++ b/contrib/libs/grpc/src/core/lib/gpr/spinlock.h
@@ -25,9 +25,9 @@
/* Simple spinlock. No backoff strategy, gpr_spinlock_lock is almost always
a concurrency code smell. */
-struct gpr_spinlock {
+struct gpr_spinlock {
gpr_atm atm;
-};
+};
#ifdef __cplusplus
#define GPR_SPINLOCK_INITIALIZER (gpr_spinlock{0})
#else
diff --git a/contrib/libs/grpc/src/core/lib/http/httpcli.cc b/contrib/libs/grpc/src/core/lib/http/httpcli.cc
index c196a8faac..6548afce99 100644
--- a/contrib/libs/grpc/src/core/lib/http/httpcli.cc
+++ b/contrib/libs/grpc/src/core/lib/http/httpcli.cc
@@ -42,7 +42,7 @@
#include "src/core/lib/iomgr/tcp_client.h"
#include "src/core/lib/slice/slice_internal.h"
-struct internal_request {
+struct internal_request {
grpc_slice request_text;
grpc_http_parser parser;
grpc_resolved_addresses* addresses;
@@ -64,7 +64,7 @@ struct internal_request {
grpc_closure connected;
grpc_error* overall_error;
grpc_resource_quota* resource_quota;
-};
+};
static grpc_httpcli_get_override g_get_override = nullptr;
static grpc_httpcli_post_override g_post_override = nullptr;
diff --git a/contrib/libs/grpc/src/core/lib/http/httpcli.h b/contrib/libs/grpc/src/core/lib/http/httpcli.h
index 16a160cc96..9d762d3e67 100644
--- a/contrib/libs/grpc/src/core/lib/http/httpcli.h
+++ b/contrib/libs/grpc/src/core/lib/http/httpcli.h
@@ -41,12 +41,12 @@ typedef struct grpc_httpcli_context {
grpc_pollset_set* pollset_set;
} grpc_httpcli_context;
-struct grpc_httpcli_handshaker {
+struct grpc_httpcli_handshaker {
const char* default_port;
void (*handshake)(void* arg, grpc_endpoint* endpoint, const char* host,
grpc_millis deadline,
void (*on_done)(void* arg, grpc_endpoint* endpoint));
-};
+};
extern const grpc_httpcli_handshaker grpc_httpcli_plaintext;
extern const grpc_httpcli_handshaker grpc_httpcli_ssl;
diff --git a/contrib/libs/grpc/src/core/lib/http/httpcli_security_connector.cc b/contrib/libs/grpc/src/core/lib/http/httpcli_security_connector.cc
index 62643186ad..dcfa154197 100644
--- a/contrib/libs/grpc/src/core/lib/http/httpcli_security_connector.cc
+++ b/contrib/libs/grpc/src/core/lib/http/httpcli_security_connector.cc
@@ -155,11 +155,11 @@ httpcli_ssl_channel_security_connector_create(
/* handshaker */
-struct on_done_closure {
+struct on_done_closure {
void (*func)(void* arg, grpc_endpoint* endpoint);
void* arg;
grpc_core::RefCountedPtr<grpc_core::HandshakeManager> handshake_mgr;
-};
+};
static void on_handshake_done(void* arg, grpc_error* error) {
auto* args = static_cast<grpc_core::HandshakerArgs*>(arg);
on_done_closure* c = static_cast<on_done_closure*>(args->user_data);
diff --git a/contrib/libs/grpc/src/core/lib/http/parser.h b/contrib/libs/grpc/src/core/lib/http/parser.h
index 2da21903e6..392fc464fe 100644
--- a/contrib/libs/grpc/src/core/lib/http/parser.h
+++ b/contrib/libs/grpc/src/core/lib/http/parser.h
@@ -79,7 +79,7 @@ typedef struct grpc_http_response {
char* body = nullptr;
} grpc_http_response;
-struct grpc_http_parser {
+struct grpc_http_parser {
grpc_http_parser_state state;
grpc_http_type type;
@@ -94,7 +94,7 @@ struct grpc_http_parser {
uint8_t cur_line[GRPC_HTTP_PARSER_MAX_HEADER_LENGTH];
size_t cur_line_length;
size_t cur_line_end_length;
-};
+};
void grpc_http_parser_init(grpc_http_parser* parser, grpc_http_type type,
void* request_or_response);
void grpc_http_parser_destroy(grpc_http_parser* parser);
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/closure.h b/contrib/libs/grpc/src/core/lib/iomgr/closure.h
index 6bb65340d1..82cab6bcb7 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/closure.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/closure.h
@@ -121,11 +121,11 @@ inline grpc_closure* grpc_closure_init(grpc_closure* closure,
namespace closure_impl {
-struct wrapped_closure {
+struct wrapped_closure {
grpc_iomgr_cb_func cb;
void* cb_arg;
grpc_closure wrapper;
-};
+};
inline void closure_wrapper(void* arg, grpc_error* error) {
wrapped_closure* wc = static_cast<wrapped_closure*>(arg);
grpc_iomgr_cb_func cb = wc->cb;
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/endpoint_cfstream.cc b/contrib/libs/grpc/src/core/lib/iomgr/endpoint_cfstream.cc
index d3a9c9b200..3592018b91 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/endpoint_cfstream.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/endpoint_cfstream.cc
@@ -41,7 +41,7 @@
extern grpc_core::TraceFlag grpc_tcp_trace;
-struct CFStreamEndpoint {
+struct CFStreamEndpoint {
grpc_endpoint base;
gpr_refcount refcount;
@@ -61,7 +61,7 @@ struct CFStreamEndpoint {
TString local_address;
grpc_resource_user* resource_user;
grpc_resource_user_slice_allocator slice_allocator;
-};
+};
static void CFStreamFree(CFStreamEndpoint* ep) {
grpc_resource_user_unref(ep->resource_user);
CFRelease(ep->read_stream);
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/endpoint_pair.h b/contrib/libs/grpc/src/core/lib/iomgr/endpoint_pair.h
index e01185b9fb..1b86eae731 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/endpoint_pair.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/endpoint_pair.h
@@ -23,10 +23,10 @@
#include "src/core/lib/iomgr/endpoint.h"
-struct grpc_endpoint_pair {
+struct grpc_endpoint_pair {
grpc_endpoint* client;
grpc_endpoint* server;
-};
+};
grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name,
grpc_channel_args* args);
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/error.cc b/contrib/libs/grpc/src/core/lib/iomgr/error.cc
index c4b5c73952..10f39c5df6 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/error.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/error.cc
@@ -446,11 +446,11 @@ grpc_error* grpc_error_set_int(grpc_error* src, grpc_error_ints which,
return new_err;
}
-struct special_error_status_map {
+struct special_error_status_map {
grpc_status_code code;
const char* msg;
size_t len;
-};
+};
const special_error_status_map error_status_map[] = {
{GRPC_STATUS_OK, "", 0}, // GRPC_ERROR_NONE
{GRPC_STATUS_INVALID_ARGUMENT, "", 0}, // GRPC_ERROR_RESERVED_1
@@ -531,15 +531,15 @@ static const char* no_error_string = "\"No Error\"";
static const char* oom_error_string = "\"Out of memory\"";
static const char* cancelled_error_string = "\"Cancelled\"";
-struct kv_pair {
+struct kv_pair {
char* key;
char* value;
-};
-struct kv_pairs {
+};
+struct kv_pairs {
kv_pair* kvs;
size_t num_kvs;
size_t cap_kvs;
-};
+};
static void append_chr(char c, char** s, size_t* sz, size_t* cap) {
if (*sz == *cap) {
*cap = GPR_MAX(8, 3 * *cap / 2);
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/contrib/libs/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
index 2dd9bbdffd..19f0b283e4 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
@@ -260,10 +260,10 @@ static void fd_global_shutdown(void);
* Pollset Declarations
*/
-struct pwlink {
+struct pwlink {
grpc_pollset_worker* next;
grpc_pollset_worker* prev;
-};
+};
typedef enum { PWLINK_POLLABLE = 0, PWLINK_POLLSET, PWLINK_COUNT } pwlinks;
struct grpc_pollset_worker {
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/ev_posix.cc b/contrib/libs/grpc/src/core/lib/iomgr/ev_posix.cc
index 3d32359be4..2c3943cc15 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/ev_posix.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/ev_posix.cc
@@ -81,10 +81,10 @@ static const char* g_poll_strategy_name = nullptr;
typedef const grpc_event_engine_vtable* (*event_engine_factory_fn)(
bool explicit_request);
-struct event_engine_factory {
+struct event_engine_factory {
const char* name;
event_engine_factory_fn factory;
-};
+};
namespace {
grpc_poll_function_type real_poll_function;
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/resolve_address.h b/contrib/libs/grpc/src/core/lib/iomgr/resolve_address.h
index 57126c7c93..16fb161ee0 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/resolve_address.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/resolve_address.h
@@ -41,14 +41,14 @@
#define GRPC_MAX_SOCKADDR_SIZE 128
-struct grpc_resolved_address {
+struct grpc_resolved_address {
char addr[GRPC_MAX_SOCKADDR_SIZE];
socklen_t len;
-};
-struct grpc_resolved_addresses {
+};
+struct grpc_resolved_addresses {
size_t naddrs;
grpc_resolved_address* addrs;
-};
+};
typedef struct grpc_address_resolver_vtable {
void (*resolve_address)(const char* addr, const char* default_port,
grpc_pollset_set* interested_parties,
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_posix.cc b/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_posix.cc
index 4f29087391..3bc1244d34 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_posix.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_posix.cc
@@ -139,14 +139,14 @@ done:
return err;
}
-struct request {
+struct request {
char* name;
char* default_port;
grpc_closure* on_done;
grpc_resolved_addresses** addrs_out;
grpc_closure request_closure;
void* arg;
-};
+};
/* Callback to be passed to grpc Executor to asynch-ify
* grpc_blocking_resolve_address */
static void do_request_thread(void* rp, grpc_error* /*error*/) {
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_windows.cc b/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_windows.cc
index 9922b88065..985525dc86 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_windows.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/resolve_address_windows.cc
@@ -47,13 +47,13 @@
#include "src/core/lib/iomgr/iomgr_internal.h"
#include "src/core/lib/iomgr/sockaddr_utils.h"
-struct request {
+struct request {
char* name;
char* default_port;
grpc_closure request_closure;
grpc_closure* on_done;
grpc_resolved_addresses** addresses;
-};
+};
static grpc_error* windows_blocking_resolve_address(
const char* name, const char* default_port,
grpc_resolved_addresses** addresses) {
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/resource_quota.cc b/contrib/libs/grpc/src/core/lib/iomgr/resource_quota.cc
index f416e096f4..fe1192aa3e 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/resource_quota.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/resource_quota.cc
@@ -42,10 +42,10 @@ grpc_core::TraceFlag grpc_resource_quota_trace(false, "resource_quota");
#define MEMORY_USAGE_ESTIMATION_MAX 65536
/* Internal linked list pointers for a resource user */
-struct grpc_resource_user_link {
+struct grpc_resource_user_link {
grpc_resource_user* next;
grpc_resource_user* prev;
-};
+};
/* Resource users are kept in (potentially) several intrusive linked lists
at once. These are the list names. */
typedef enum {
@@ -614,11 +614,11 @@ static void ru_allocated_slices(void* arg, grpc_error* error) {
* combiner
*/
-struct rq_resize_args {
+struct rq_resize_args {
int64_t size;
grpc_resource_quota* resource_quota;
grpc_closure closure;
-};
+};
static void rq_resize(void* args, grpc_error* /*error*/) {
rq_resize_args* a = static_cast<rq_resize_args*>(args);
int64_t delta = a->size - a->resource_quota->size;
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/socket_factory_posix.h b/contrib/libs/grpc/src/core/lib/iomgr/socket_factory_posix.h
index 92ea6c16b7..51714ec540 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/socket_factory_posix.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/socket_factory_posix.h
@@ -26,7 +26,7 @@
#include "src/core/lib/iomgr/resolve_address.h"
/** The virtual table of grpc_socket_factory */
-struct grpc_socket_factory_vtable {
+struct grpc_socket_factory_vtable {
/** Replacement for socket(2) */
int (*socket)(grpc_socket_factory* factory, int domain, int type,
int protocol);
@@ -37,7 +37,7 @@ struct grpc_socket_factory_vtable {
int (*compare)(grpc_socket_factory* a, grpc_socket_factory* b);
/** Destroys the socket factory instance */
void (*destroy)(grpc_socket_factory* factory);
-};
+};
/** The Socket Factory interface allows changes on socket options */
struct grpc_socket_factory {
const grpc_socket_factory_vtable* vtable;
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/socket_mutator.h b/contrib/libs/grpc/src/core/lib/iomgr/socket_mutator.h
index 9f77a3b266..70b73052d1 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/socket_mutator.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/socket_mutator.h
@@ -27,14 +27,14 @@
#include <stdbool.h>
/** The virtual table of grpc_socket_mutator */
-struct grpc_socket_mutator_vtable {
+struct grpc_socket_mutator_vtable {
/** Mutates the socket options of \a fd */
bool (*mutate_fd)(int fd, grpc_socket_mutator* mutator);
/** Compare socket mutator \a a and \a b */
int (*compare)(grpc_socket_mutator* a, grpc_socket_mutator* b);
/** Destroys the socket mutator instance */
void (*destroy)(grpc_socket_mutator* mutator);
-};
+};
/** The Socket Mutator interface allows changes on socket options */
struct grpc_socket_mutator {
const grpc_socket_mutator_vtable* vtable;
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc b/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc
index 401ddd2f68..aea1db342b 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc
@@ -50,7 +50,7 @@
extern grpc_core::TraceFlag grpc_tcp_trace;
-struct async_connect {
+struct async_connect {
gpr_mu mu;
grpc_fd* fd;
grpc_timer alarm;
@@ -62,7 +62,7 @@ struct async_connect {
grpc_endpoint** ep;
grpc_closure* closure;
grpc_channel_args* channel_args;
-};
+};
static grpc_error* prepare_socket(const grpc_resolved_address* addr, int fd,
const grpc_channel_args* channel_args) {
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_windows.cc b/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_windows.cc
index a57e7539f2..36cfba9457 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_windows.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_windows.cc
@@ -41,7 +41,7 @@
#include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/slice/slice_internal.h"
-struct async_connect {
+struct async_connect {
grpc_closure* on_done;
gpr_mu mu;
grpc_winsocket* socket;
@@ -52,7 +52,7 @@ struct async_connect {
grpc_closure on_connect;
grpc_endpoint** endpoint;
grpc_channel_args* channel_args;
-};
+};
static void async_connect_unlock_and_cleanup(async_connect* ac,
grpc_winsocket* socket) {
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/tcp_custom.cc b/contrib/libs/grpc/src/core/lib/iomgr/tcp_custom.cc
index 3e562da508..265292abb8 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/tcp_custom.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/tcp_custom.cc
@@ -53,7 +53,7 @@ void grpc_custom_endpoint_init(grpc_socket_vtable* impl) {
grpc_set_tcp_server_impl(&custom_tcp_server_vtable);
}
-struct custom_tcp_endpoint {
+struct custom_tcp_endpoint {
grpc_endpoint base;
gpr_refcount refcount;
grpc_custom_socket* socket;
@@ -71,7 +71,7 @@ struct custom_tcp_endpoint {
TString peer_string;
TString local_address;
-};
+};
static void tcp_free(grpc_custom_socket* s) {
custom_tcp_endpoint* tcp = (custom_tcp_endpoint*)s->endpoint;
grpc_resource_user_unref(tcp->resource_user);
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/time_averaged_stats.h b/contrib/libs/grpc/src/core/lib/iomgr/time_averaged_stats.h
index 877d1bec0e..6d521e06c6 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/time_averaged_stats.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/time_averaged_stats.h
@@ -24,7 +24,7 @@
weighted mean. It is designed for batch operations where we do many adds
before updating the average. */
-struct grpc_time_averaged_stats {
+struct grpc_time_averaged_stats {
/* The initial average value. This is the reported average until the first
grpc_time_averaged_stats_update_average call. If a positive regress_weight
is used, we also regress towards this value on each update. */
@@ -56,7 +56,7 @@ struct grpc_time_averaged_stats {
/* A time-decayed average of the (batch_total_value_ / batch_num_samples_),
computed by decaying the samples_in_avg_ weight in the weighted average. */
double aggregate_weighted_avg;
-};
+};
/* See the comments on the members above for an explanation of init_avg,
regress_weight, and persistence_factor. */
void grpc_time_averaged_stats_init(grpc_time_averaged_stats* stats,
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/timer_generic.cc b/contrib/libs/grpc/src/core/lib/iomgr/timer_generic.cc
index fb0e50c53c..d916012701 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/timer_generic.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/timer_generic.cc
@@ -59,7 +59,7 @@ grpc_core::TraceFlag grpc_timer_check_trace(false, "timer_check");
* stats maintained in 'stats' and the relevant timers are then moved from the
* 'list' to 'heap'.
*/
-struct timer_shard {
+struct timer_shard {
gpr_mu mu;
grpc_time_averaged_stats stats;
/* All and only timers with deadlines < this will be in the heap. */
@@ -73,7 +73,7 @@ struct timer_shard {
grpc_timer_heap heap;
/* This holds timers whose deadline is >= queue_deadline_cap. */
grpc_timer list;
-};
+};
static size_t g_num_shards;
/* Array of timer shards. Whenever a timer (grpc_timer *) is added, its address
diff --git a/contrib/libs/grpc/src/core/lib/iomgr/timer_heap.h b/contrib/libs/grpc/src/core/lib/iomgr/timer_heap.h
index 2b08c65108..1f2f52e548 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/timer_heap.h
+++ b/contrib/libs/grpc/src/core/lib/iomgr/timer_heap.h
@@ -23,11 +23,11 @@
#include "src/core/lib/iomgr/timer.h"
-struct grpc_timer_heap {
+struct grpc_timer_heap {
grpc_timer** timers;
uint32_t timer_count;
uint32_t timer_capacity;
-};
+};
/* return true if the new timer is the first timer in the heap */
bool grpc_timer_heap_add(grpc_timer_heap* heap, grpc_timer* timer);
diff --git a/contrib/libs/grpc/src/core/lib/security/credentials/credentials.h b/contrib/libs/grpc/src/core/lib/security/credentials/credentials.h
index 15a85cbd0b..275bd711ec 100644
--- a/contrib/libs/grpc/src/core/lib/security/credentials/credentials.h
+++ b/contrib/libs/grpc/src/core/lib/security/credentials/credentials.h
@@ -150,10 +150,10 @@ grpc_channel_credentials* grpc_channel_credentials_find_in_args(
/* --- grpc_credentials_mdelem_array. --- */
-struct grpc_credentials_mdelem_array {
+struct grpc_credentials_mdelem_array {
grpc_mdelem* md = nullptr;
size_t size = 0;
-};
+};
/// Takes a new ref to \a md.
void grpc_credentials_mdelem_array_add(grpc_credentials_mdelem_array* list,
grpc_mdelem md);
diff --git a/contrib/libs/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/contrib/libs/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc
index 8f3ca009a5..d4d190d1c9 100644
--- a/contrib/libs/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc
+++ b/contrib/libs/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc
@@ -69,12 +69,12 @@ static grpc_core::internal::grpc_gce_tenancy_checker g_gce_tenancy_checker =
static void init_default_credentials(void) { gpr_mu_init(&g_state_mu); }
-struct metadata_server_detector {
+struct metadata_server_detector {
grpc_polling_entity pollent;
int is_done;
int success;
grpc_http_response response;
-};
+};
grpc_core::RefCountedPtr<grpc_channel_security_connector>
grpc_google_default_channel_credentials::create_security_connector(
grpc_core::RefCountedPtr<grpc_call_credentials> call_creds,
diff --git a/contrib/libs/grpc/src/core/lib/security/credentials/jwt/json_token.h b/contrib/libs/grpc/src/core/lib/security/credentials/jwt/json_token.h
index b9a41c6b2b..0a5c0396d4 100644
--- a/contrib/libs/grpc/src/core/lib/security/credentials/jwt/json_token.h
+++ b/contrib/libs/grpc/src/core/lib/security/credentials/jwt/json_token.h
@@ -32,13 +32,13 @@
/* --- auth_json_key parsing. --- */
-struct grpc_auth_json_key {
+struct grpc_auth_json_key {
const char* type;
char* private_key_id;
char* client_id;
char* client_email;
RSA* private_key;
-};
+};
/* Returns 1 if the object is valid, 0 otherwise. */
int grpc_auth_json_key_is_valid(const grpc_auth_json_key* json_key);
diff --git a/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc
index 0c9e118826..db643ff5f1 100644
--- a/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc
+++ b/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc
@@ -118,13 +118,13 @@ static gpr_timespec validate_time_field(const Json& json, const char* key) {
/* --- JOSE header. see http://tools.ietf.org/html/rfc7515#section-4 --- */
-struct jose_header {
+struct jose_header {
const char* alg;
const char* kid;
const char* typ;
/* TODO(jboeuf): Add others as needed (jku, jwk, x5u, x5c and so on...). */
grpc_core::ManualConstructor<Json> json;
-};
+};
static void jose_header_destroy(jose_header* h) {
h->json.Destroy();
gpr_free(h);
diff --git a/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.h b/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.h
index 66ddbf2206..7a6b1d4ff7 100644
--- a/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.h
+++ b/contrib/libs/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.h
@@ -71,7 +71,7 @@ gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims* claims);
typedef struct grpc_jwt_verifier grpc_jwt_verifier;
-struct grpc_jwt_verifier_email_domain_key_url_mapping {
+struct grpc_jwt_verifier_email_domain_key_url_mapping {
/* The email domain is the part after the @ sign. */
const char* email_domain;
@@ -79,7 +79,7 @@ struct grpc_jwt_verifier_email_domain_key_url_mapping {
https://<key_url_prefix>/<issuer_email>
Therefore the key_url_prefix must NOT contain https://. */
const char* key_url_prefix;
-};
+};
/* Globals to control the verifier. Not thread-safe. */
extern gpr_timespec grpc_jwt_verifier_clock_skew;
extern grpc_millis grpc_jwt_verifier_max_delay;
diff --git a/contrib/libs/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/contrib/libs/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
index fd886405cf..bc69fe9d29 100644
--- a/contrib/libs/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
+++ b/contrib/libs/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
@@ -34,12 +34,12 @@
"s&subject_token_type=%s"
// auth_refresh_token parsing.
-struct grpc_auth_refresh_token {
+struct grpc_auth_refresh_token {
const char* type;
char* client_id;
char* client_secret;
char* refresh_token;
-};
+};
/// Returns 1 if the object is valid, 0 otherwise.
int grpc_auth_refresh_token_is_valid(
const grpc_auth_refresh_token* refresh_token);
diff --git a/contrib/libs/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/contrib/libs/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
index 04c32bb2a8..e20d7f11ba 100644
--- a/contrib/libs/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
+++ b/contrib/libs/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
@@ -29,13 +29,13 @@
#include "src/core/tsi/ssl_transport_security.h"
#include "src/core/tsi/transport_security_interface.h"
-struct grpc_ssl_config {
+struct grpc_ssl_config {
tsi_ssl_pem_key_cert_pair* pem_key_cert_pair;
char* pem_root_certs;
verify_peer_options verify_options;
grpc_tls_version min_tls_version = grpc_tls_version::TLS1_2;
grpc_tls_version max_tls_version = grpc_tls_version::TLS1_3;
-};
+};
/* Creates an SSL channel_security_connector.
- request_metadata_creds is the credentials object which metadata
@@ -59,7 +59,7 @@ grpc_ssl_channel_security_connector_create(
tsi_ssl_session_cache* ssl_session_cache);
/* Config for ssl servers. */
-struct grpc_ssl_server_config {
+struct grpc_ssl_server_config {
tsi_ssl_pem_key_cert_pair* pem_key_cert_pairs = nullptr;
size_t num_key_cert_pairs = 0;
char* pem_root_certs = nullptr;
@@ -67,7 +67,7 @@ struct grpc_ssl_server_config {
GRPC_SSL_DONT_REQUEST_CLIENT_CERTIFICATE;
grpc_tls_version min_tls_version = grpc_tls_version::TLS1_2;
grpc_tls_version max_tls_version = grpc_tls_version::TLS1_3;
-};
+};
/* Creates an SSL server_security_connector.
- config is the SSL config to be used for the SSL channel establishment.
- sc is a pointer on the connector to be created.
diff --git a/contrib/libs/grpc/src/core/lib/slice/slice_intern.cc b/contrib/libs/grpc/src/core/lib/slice/slice_intern.cc
index b41628c70b..f0f40efb91 100644
--- a/contrib/libs/grpc/src/core/lib/slice/slice_intern.cc
+++ b/contrib/libs/grpc/src/core/lib/slice/slice_intern.cc
@@ -52,10 +52,10 @@ typedef struct slice_shard {
static slice_shard g_shards[SHARD_COUNT];
-struct static_metadata_hash_ent {
+struct static_metadata_hash_ent {
uint32_t hash;
uint32_t idx;
-};
+};
static static_metadata_hash_ent
static_metadata_hash[4 * GRPC_STATIC_MDSTR_COUNT];
static uint32_t max_static_metadata_hash_probe;
diff --git a/contrib/libs/grpc/src/core/lib/surface/call.cc b/contrib/libs/grpc/src/core/lib/surface/call.cc
index fe4c774c52..db46d85391 100644
--- a/contrib/libs/grpc/src/core/lib/surface/call.cc
+++ b/contrib/libs/grpc/src/core/lib/surface/call.cc
@@ -679,11 +679,11 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call* c,
return GRPC_CALL_OK;
}
-struct cancel_state {
+struct cancel_state {
grpc_call* call;
grpc_closure start_batch;
grpc_closure finish_batch;
-};
+};
// The on_complete callback used when sending a cancel_stream batch down
// the filter stack. Yields the call combiner when the batch is done.
static void done_termination(void* arg, grpc_error* /*error*/) {
diff --git a/contrib/libs/grpc/src/core/lib/surface/channel_ping.cc b/contrib/libs/grpc/src/core/lib/surface/channel_ping.cc
index 82e552194b..4c51615b95 100644
--- a/contrib/libs/grpc/src/core/lib/surface/channel_ping.cc
+++ b/contrib/libs/grpc/src/core/lib/surface/channel_ping.cc
@@ -28,12 +28,12 @@
#include "src/core/lib/surface/api_trace.h"
#include "src/core/lib/surface/completion_queue.h"
-struct ping_result {
+struct ping_result {
grpc_closure closure;
void* tag;
grpc_completion_queue* cq;
grpc_cq_completion completion_storage;
-};
+};
static void ping_destroy(void* arg, grpc_cq_completion* /*storage*/) {
gpr_free(arg);
}
diff --git a/contrib/libs/grpc/src/core/lib/surface/completion_queue.cc b/contrib/libs/grpc/src/core/lib/surface/completion_queue.cc
index 0f50906734..3a1f438cd7 100644
--- a/contrib/libs/grpc/src/core/lib/surface/completion_queue.cc
+++ b/contrib/libs/grpc/src/core/lib/surface/completion_queue.cc
@@ -61,11 +61,11 @@ namespace {
GPR_TLS_DECL(g_cached_event);
GPR_TLS_DECL(g_cached_cq);
-struct plucker {
+struct plucker {
grpc_pollset_worker** worker;
void* tag;
-};
-struct cq_poller_vtable {
+};
+struct cq_poller_vtable {
bool can_get_pollset;
bool can_listen;
size_t (*size)(void);
@@ -76,7 +76,7 @@ struct cq_poller_vtable {
grpc_millis deadline);
void (*shutdown)(grpc_pollset* pollset, grpc_closure* closure);
void (*destroy)(grpc_pollset* pollset);
-};
+};
typedef struct non_polling_worker {
gpr_cv cv;
bool kicked;
@@ -84,12 +84,12 @@ typedef struct non_polling_worker {
struct non_polling_worker* prev;
} non_polling_worker;
-struct non_polling_poller {
+struct non_polling_poller {
gpr_mu mu;
bool kicked_without_poller;
non_polling_worker* root;
grpc_closure* shutdown;
-};
+};
size_t non_polling_poller_size(void) { return sizeof(non_polling_poller); }
void non_polling_poller_init(grpc_pollset* pollset, gpr_mu** mu) {
@@ -899,14 +899,14 @@ void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, grpc_error* error,
cq->vtable->end_op(cq, tag, error, done, done_arg, storage, internal);
}
-struct cq_is_finished_arg {
+struct cq_is_finished_arg {
gpr_atm last_seen_things_queued_ever;
grpc_completion_queue* cq;
grpc_millis deadline;
grpc_cq_completion* stolen_completion;
void* tag; /* for pluck */
bool first_loop;
-};
+};
class ExecCtxNext : public grpc_core::ExecCtx {
public:
ExecCtxNext(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {}
diff --git a/contrib/libs/grpc/src/core/lib/transport/metadata_batch.h b/contrib/libs/grpc/src/core/lib/transport/metadata_batch.h
index 3101f485a2..ed2ec5c1ff 100644
--- a/contrib/libs/grpc/src/core/lib/transport/metadata_batch.h
+++ b/contrib/libs/grpc/src/core/lib/transport/metadata_batch.h
@@ -154,10 +154,10 @@ inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail(
grpc_error* grpc_attach_md_to_error(grpc_error* src, grpc_mdelem md);
-struct grpc_filtered_mdelem {
+struct grpc_filtered_mdelem {
grpc_error* error;
grpc_mdelem md;
-};
+};
#define GRPC_FILTERED_ERROR(error) \
{ (error), GRPC_MDNULL }
#define GRPC_FILTERED_MDELEM(md) \
diff --git a/contrib/libs/grpc/src/core/lib/transport/transport.cc b/contrib/libs/grpc/src/core/lib/transport/transport.cc
index 99a32980aa..57f3be061a 100644
--- a/contrib/libs/grpc/src/core/lib/transport/transport.cc
+++ b/contrib/libs/grpc/src/core/lib/transport/transport.cc
@@ -233,12 +233,12 @@ grpc_transport_op* grpc_make_transport_op(grpc_closure* on_complete) {
return &op->op;
}
-struct made_transport_stream_op {
+struct made_transport_stream_op {
grpc_closure outer_on_complete;
grpc_closure* inner_on_complete;
grpc_transport_stream_op_batch op;
grpc_transport_stream_op_batch_payload payload;
-};
+};
static void destroy_made_transport_stream_op(void* arg, grpc_error* error) {
made_transport_stream_op* op = static_cast<made_transport_stream_op*>(arg);
grpc_closure* c = op->inner_on_complete;
diff --git a/contrib/libs/grpc/src/core/lib/uri/uri_parser.h b/contrib/libs/grpc/src/core/lib/uri/uri_parser.h
index ccb9a4f29e..5238ff882f 100644
--- a/contrib/libs/grpc/src/core/lib/uri/uri_parser.h
+++ b/contrib/libs/grpc/src/core/lib/uri/uri_parser.h
@@ -25,7 +25,7 @@
#include <stddef.h>
-struct grpc_uri {
+struct grpc_uri {
char* scheme;
char* authority;
char* path;
@@ -37,7 +37,7 @@ struct grpc_uri {
/** Split each query part by '='. NULL if not present. */
char** query_parts_values;
char* fragment;
-};
+};
/** parse a uri, return NULL on failure */
grpc_uri* grpc_uri_parse(y_absl::string_view uri_text, bool suppress_errors);
diff --git a/contrib/libs/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h b/contrib/libs/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h
index 571a915768..6925749f03 100644
--- a/contrib/libs/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h
+++ b/contrib/libs/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h
@@ -31,7 +31,7 @@
#include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
/* V-table for alts_grpc_record_protocol implementations. */
-struct alts_grpc_record_protocol_vtable {
+struct alts_grpc_record_protocol_vtable {
tsi_result (*protect)(alts_grpc_record_protocol* self,
grpc_slice_buffer* unprotected_slices,
grpc_slice_buffer* protected_slices);
@@ -39,7 +39,7 @@ struct alts_grpc_record_protocol_vtable {
grpc_slice_buffer* protected_slices,
grpc_slice_buffer* unprotected_slices);
void (*destruct)(alts_grpc_record_protocol* self);
-};
+};
/* Main struct for alts_grpc_record_protocol implementation, shared by both
* integrity-only record protocol and privacy-integrity record protocol.
* Integrity-only record protocol has additional data elements.
diff --git a/contrib/libs/grpc/src/core/tsi/fake_transport_security.cc b/contrib/libs/grpc/src/core/tsi/fake_transport_security.cc
index 1b6b8ca07b..b09d54845c 100644
--- a/contrib/libs/grpc/src/core/tsi/fake_transport_security.cc
+++ b/contrib/libs/grpc/src/core/tsi/fake_transport_security.cc
@@ -42,13 +42,13 @@
| size | data |
where the size field value is the size of the size field plus the size of
the data encoded in little endian on 4 bytes. */
-struct tsi_fake_frame {
+struct tsi_fake_frame {
unsigned char* data;
size_t size;
size_t allocated_size;
size_t offset;
int needs_draining;
-};
+};
typedef enum {
TSI_FAKE_CLIENT_INIT = 0,
TSI_FAKE_SERVER_INIT = 1,
@@ -57,7 +57,7 @@ typedef enum {
TSI_FAKE_HANDSHAKE_MESSAGE_MAX = 4
} tsi_fake_handshake_message;
-struct tsi_fake_handshaker {
+struct tsi_fake_handshaker {
tsi_handshaker base;
int is_client;
tsi_fake_handshake_message next_message_to_send;
@@ -67,20 +67,20 @@ struct tsi_fake_handshaker {
unsigned char* outgoing_bytes_buffer;
size_t outgoing_bytes_buffer_size;
tsi_result result;
-};
-struct tsi_fake_frame_protector {
+};
+struct tsi_fake_frame_protector {
tsi_frame_protector base;
tsi_fake_frame protect_frame;
tsi_fake_frame unprotect_frame;
size_t max_frame_size;
-};
-struct tsi_fake_zero_copy_grpc_protector {
+};
+struct tsi_fake_zero_copy_grpc_protector {
tsi_zero_copy_grpc_protector base;
grpc_slice_buffer header_sb;
grpc_slice_buffer protected_sb;
size_t max_frame_size;
size_t parsed_frame_size;
-};
+};
/* --- Utils. ---*/
static const char* tsi_fake_handshake_message_strings[] = {
@@ -484,11 +484,11 @@ static const tsi_zero_copy_grpc_protector_vtable
/* --- tsi_handshaker_result methods implementation. ---*/
-struct fake_handshaker_result {
+struct fake_handshaker_result {
tsi_handshaker_result base;
unsigned char* unused_bytes;
size_t unused_bytes_size;
-};
+};
static tsi_result fake_handshaker_result_extract_peer(
const tsi_handshaker_result* self, tsi_peer* peer) {
/* Construct a tsi_peer with 1 property: certificate type, security_level. */
diff --git a/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc b/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc
index 374f8e583f..3cee85f203 100644
--- a/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc
+++ b/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc
@@ -109,7 +109,7 @@ struct tsi_ssl_server_handshaker_factory {
size_t alpn_protocol_list_length;
};
-struct tsi_ssl_handshaker {
+struct tsi_ssl_handshaker {
tsi_handshaker base;
SSL* ssl;
BIO* network_io;
@@ -117,22 +117,22 @@ struct tsi_ssl_handshaker {
unsigned char* outgoing_bytes_buffer;
size_t outgoing_bytes_buffer_size;
tsi_ssl_handshaker_factory* factory_ref;
-};
-struct tsi_ssl_handshaker_result {
+};
+struct tsi_ssl_handshaker_result {
tsi_handshaker_result base;
SSL* ssl;
BIO* network_io;
unsigned char* unused_bytes;
size_t unused_bytes_size;
-};
-struct tsi_ssl_frame_protector {
+};
+struct tsi_ssl_frame_protector {
tsi_frame_protector base;
SSL* ssl;
BIO* network_io;
unsigned char* buffer;
size_t buffer_size;
size_t buffer_offset;
-};
+};
/* --- Library Initialization. ---*/
static gpr_once g_init_openssl_once = GPR_ONCE_INIT;
diff --git a/contrib/libs/grpc/src/core/tsi/ssl_transport_security.h b/contrib/libs/grpc/src/core/tsi/ssl_transport_security.h
index 2f2dc08c05..5dde1d8b12 100644
--- a/contrib/libs/grpc/src/core/tsi/ssl_transport_security.h
+++ b/contrib/libs/grpc/src/core/tsi/ssl_transport_security.h
@@ -84,7 +84,7 @@ typedef struct tsi_ssl_client_handshaker_factory
tsi_ssl_client_handshaker_factory;
/* Object that holds a private key / certificate chain pair in PEM format. */
-struct tsi_ssl_pem_key_cert_pair {
+struct tsi_ssl_pem_key_cert_pair {
/* private_key is the NULL-terminated string containing the PEM encoding of
the client's private key. */
const char* private_key;
@@ -92,7 +92,7 @@ struct tsi_ssl_pem_key_cert_pair {
/* cert_chain is the NULL-terminated string containing the PEM encoding of
the client's certificate chain. */
const char* cert_chain;
-};
+};
/* TO BE DEPRECATED.
Creates a client handshaker factory.
- pem_key_cert_pair is a pointer to the object containing client's private
@@ -345,9 +345,9 @@ typedef void (*tsi_ssl_handshaker_factory_destructor)(
tsi_ssl_handshaker_factory* factory);
/* Virtual table for tsi_ssl_handshaker_factory. */
-struct tsi_ssl_handshaker_factory_vtable {
+struct tsi_ssl_handshaker_factory_vtable {
tsi_ssl_handshaker_factory_destructor destroy;
-};
+};
/* Set destructor of handshaker_factory to new_destructor, returns previous
destructor. */
const tsi_ssl_handshaker_factory_vtable* tsi_ssl_handshaker_factory_swap_vtable(
diff --git a/contrib/libs/grpc/src/core/tsi/transport_security.h b/contrib/libs/grpc/src/core/tsi/transport_security.h
index d3b1c7f4aa..3477792ac7 100644
--- a/contrib/libs/grpc/src/core/tsi/transport_security.h
+++ b/contrib/libs/grpc/src/core/tsi/transport_security.h
@@ -30,7 +30,7 @@ extern grpc_core::TraceFlag tsi_tracing_enabled;
/* Base for tsi_frame_protector implementations.
See transport_security_interface.h for documentation. */
-struct tsi_frame_protector_vtable {
+struct tsi_frame_protector_vtable {
tsi_result (*protect)(tsi_frame_protector* self,
const unsigned char* unprotected_bytes,
size_t* unprotected_bytes_size,
@@ -46,14 +46,14 @@ struct tsi_frame_protector_vtable {
unsigned char* unprotected_bytes,
size_t* unprotected_bytes_size);
void (*destroy)(tsi_frame_protector* self);
-};
+};
struct tsi_frame_protector {
const tsi_frame_protector_vtable* vtable;
};
/* Base for tsi_handshaker implementations.
See transport_security_interface.h for documentation. */
-struct tsi_handshaker_vtable {
+struct tsi_handshaker_vtable {
tsi_result (*get_bytes_to_send_to_peer)(tsi_handshaker* self,
unsigned char* bytes,
size_t* bytes_size);
@@ -73,7 +73,7 @@ struct tsi_handshaker_vtable {
tsi_handshaker_result** handshaker_result,
tsi_handshaker_on_next_done_cb cb, void* user_data);
void (*shutdown)(tsi_handshaker* self);
-};
+};
struct tsi_handshaker {
const tsi_handshaker_vtable* vtable;
bool frame_protector_created;
@@ -89,7 +89,7 @@ struct tsi_handshaker {
in grpc, where we do need the exec_ctx passed through, but the API still
needs to compile in other applications, where grpc_exec_ctx is not defined.
*/
-struct tsi_handshaker_result_vtable {
+struct tsi_handshaker_result_vtable {
tsi_result (*extract_peer)(const tsi_handshaker_result* self, tsi_peer* peer);
tsi_result (*create_zero_copy_grpc_protector)(
const tsi_handshaker_result* self,
@@ -102,7 +102,7 @@ struct tsi_handshaker_result_vtable {
const unsigned char** bytes,
size_t* bytes_size);
void (*destroy)(tsi_handshaker_result* self);
-};
+};
struct tsi_handshaker_result {
const tsi_handshaker_result_vtable* vtable;
};
diff --git a/contrib/libs/grpc/src/core/tsi/transport_security_grpc.h b/contrib/libs/grpc/src/core/tsi/transport_security_grpc.h
index 4779b686c6..2e1dacb17e 100644
--- a/contrib/libs/grpc/src/core/tsi/transport_security_grpc.h
+++ b/contrib/libs/grpc/src/core/tsi/transport_security_grpc.h
@@ -61,7 +61,7 @@ tsi_result tsi_zero_copy_grpc_protector_max_frame_size(
tsi_zero_copy_grpc_protector* self, size_t* max_frame_size);
/* Base for tsi_zero_copy_grpc_protector implementations. */
-struct tsi_zero_copy_grpc_protector_vtable {
+struct tsi_zero_copy_grpc_protector_vtable {
tsi_result (*protect)(tsi_zero_copy_grpc_protector* self,
grpc_slice_buffer* unprotected_slices,
grpc_slice_buffer* protected_slices);
@@ -71,7 +71,7 @@ struct tsi_zero_copy_grpc_protector_vtable {
void (*destroy)(tsi_zero_copy_grpc_protector* self);
tsi_result (*max_frame_size)(tsi_zero_copy_grpc_protector* self,
size_t* max_frame_size);
-};
+};
struct tsi_zero_copy_grpc_protector {
const tsi_zero_copy_grpc_protector_vtable* vtable;
};
diff --git a/contrib/libs/grpc/src/core/tsi/transport_security_interface.h b/contrib/libs/grpc/src/core/tsi/transport_security_interface.h
index 4608f40091..d8a8bcf466 100644
--- a/contrib/libs/grpc/src/core/tsi/transport_security_interface.h
+++ b/contrib/libs/grpc/src/core/tsi/transport_security_interface.h
@@ -213,10 +213,10 @@ typedef struct tsi_peer_property {
} value;
} tsi_peer_property;
-struct tsi_peer {
+struct tsi_peer {
tsi_peer_property* properties;
size_t property_count;
-};
+};
/* Destructs the tsi_peer object. */
void tsi_peer_destruct(tsi_peer* self);
diff --git a/contrib/libs/libbz2/CHANGES b/contrib/libs/libbz2/CHANGES
index 30afead258..3e9314b55a 100644
--- a/contrib/libs/libbz2/CHANGES
+++ b/contrib/libs/libbz2/CHANGES
@@ -1,356 +1,356 @@
- ------------------------------------------------------------------
- This file is part of bzip2/libbzip2, a program and library for
- lossless, block-sorting data compression.
-
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
-
- Please read the WARNING, DISCLAIMER and PATENTS sections in the
- README file.
-
- This program is released under the terms of the license contained
- in the file LICENSE.
- ------------------------------------------------------------------
-
-
-0.9.0
-~~~~~
-First version.
-
-
-0.9.0a
-~~~~~~
-Removed 'ranlib' from Makefile, since most modern Unix-es
-don't need it, or even know about it.
-
-
-0.9.0b
-~~~~~~
-Fixed a problem with error reporting in bzip2.c. This does not effect
-the library in any way. Problem is: versions 0.9.0 and 0.9.0a (of the
-program proper) compress and decompress correctly, but give misleading
-error messages (internal panics) when an I/O error occurs, instead of
-reporting the problem correctly. This shouldn't give any data loss
-(as far as I can see), but is confusing.
-
-Made the inline declarations disappear for non-GCC compilers.
-
-
-0.9.0c
-~~~~~~
-Fixed some problems in the library pertaining to some boundary cases.
-This makes the library behave more correctly in those situations. The
-fixes apply only to features (calls and parameters) not used by
-bzip2.c, so the non-fixedness of them in previous versions has no
-effect on reliability of bzip2.c.
-
-In bzlib.c:
- * made zero-length BZ_FLUSH work correctly in bzCompress().
- * fixed bzWrite/bzRead to ignore zero-length requests.
- * fixed bzread to correctly handle read requests after EOF.
- * wrong parameter order in call to bzDecompressInit in
- bzBuffToBuffDecompress. Fixed.
-
-In compress.c:
- * changed setting of nGroups in sendMTFValues() so as to
- do a bit better on small files. This _does_ effect
- bzip2.c.
-
-
-0.9.5a
-~~~~~~
-Major change: add a fallback sorting algorithm (blocksort.c)
-to give reasonable behaviour even for very repetitive inputs.
-Nuked --repetitive-best and --repetitive-fast since they are
-no longer useful.
-
-Minor changes: mostly a whole bunch of small changes/
-bugfixes in the driver (bzip2.c). Changes pertaining to the
-user interface are:
-
- allow decompression of symlink'd files to stdout
- decompress/test files even without .bz2 extension
- give more accurate error messages for I/O errors
- when compressing/decompressing to stdout, don't catch control-C
- read flags from BZIP2 and BZIP environment variables
- decline to break hard links to a file unless forced with -f
- allow -c flag even with no filenames
- preserve file ownerships as far as possible
- make -s -1 give the expected block size (100k)
- add a flag -q --quiet to suppress nonessential warnings
- stop decoding flags after --, so files beginning in - can be handled
- resolved inconsistent naming: bzcat or bz2cat ?
- bzip2 --help now returns 0
-
-Programming-level changes are:
-
- fixed syntax error in GET_LL4 for Borland C++ 5.02
- let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC}
- fix overshoot of mode-string end in bzopen_or_bzdopen
- wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... }
- close file handles under all error conditions
- added minor mods so it compiles with DJGPP out of the box
- fixed Makefile so it doesn't give problems with BSD make
- fix uninitialised memory reads in dlltest.c
-
-0.9.5b
-~~~~~~
-Open stdin/stdout in binary mode for DJGPP.
-
-0.9.5c
-~~~~~~
-Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1. The + 1
-version could cause the sorted order to be wrong in some extremely
-obscure cases. Also changed setting of quadrant in blocksort.c.
-
-0.9.5d
-~~~~~~
-The only functional change is to make bzlibVersion() in the library
-return the correct string. This has no effect whatsoever on the
-functioning of the bzip2 program or library. Added a couple of casts
-so the library compiles without warnings at level 3 in MS Visual
-Studio 6.0. Included a Y2K statement in the file Y2K_INFO. All other
-changes are minor documentation changes.
-
-1.0
-~~~
-Several minor bugfixes and enhancements:
-
-* Large file support. The library uses 64-bit counters to
- count the volume of data passing through it. bzip2.c
- is now compiled with -D_FILE_OFFSET_BITS=64 to get large
- file support from the C library. -v correctly prints out
- file sizes greater than 4 gigabytes. All these changes have
- been made without assuming a 64-bit platform or a C compiler
- which supports 64-bit ints, so, except for the C library
- aspect, they are fully portable.
-
-* Decompression robustness. The library/program should be
- robust to any corruption of compressed data, detecting and
- handling _all_ corruption, instead of merely relying on
- the CRCs. What this means is that the program should
- never crash, given corrupted data, and the library should
- always return BZ_DATA_ERROR.
-
-* Fixed an obscure race-condition bug only ever observed on
- Solaris, in which, if you were very unlucky and issued
- control-C at exactly the wrong time, both input and output
- files would be deleted.
-
-* Don't run out of file handles on test/decompression when
- large numbers of files have invalid magic numbers.
-
-* Avoid library namespace pollution. Prefix all exported
- symbols with BZ2_.
-
-* Minor sorting enhancements from my DCC2000 paper.
-
-* Advance the version number to 1.0, so as to counteract the
- (false-in-this-case) impression some people have that programs
- with version numbers less than 1.0 are in some way, experimental,
- pre-release versions.
-
-* Create an initial Makefile-libbz2_so to build a shared library.
- Yes, I know I should really use libtool et al ...
-
-* Make the program exit with 2 instead of 0 when decompression
- fails due to a bad magic number (ie, an invalid bzip2 header).
- Also exit with 1 (as the manual claims :-) whenever a diagnostic
- message would have been printed AND the corresponding operation
- is aborted, for example
- bzip2: Output file xx already exists.
- When a diagnostic message is printed but the operation is not
- aborted, for example
- bzip2: Can't guess original name for wurble -- using wurble.out
- then the exit value 0 is returned, unless some other problem is
- also detected.
-
- I think it corresponds more closely to what the manual claims now.
-
-
-1.0.1
-~~~~~
-* Modified dlltest.c so it uses the new BZ2_ naming scheme.
-* Modified makefile-msc to fix minor build probs on Win2k.
-* Updated README.COMPILATION.PROBLEMS.
-
-There are no functionality changes or bug fixes relative to version
-1.0.0. This is just a documentation update + a fix for minor Win32
-build problems. For almost everyone, upgrading from 1.0.0 to 1.0.1 is
-utterly pointless. Don't bother.
-
-
-1.0.2
-~~~~~
-A bug fix release, addressing various minor issues which have appeared
-in the 18 or so months since 1.0.1 was released. Most of the fixes
-are to do with file-handling or documentation bugs. To the best of my
-knowledge, there have been no data-loss-causing bugs reported in the
-compression/decompression engine of 1.0.0 or 1.0.1.
-
-Note that this release does not improve the rather crude build system
-for Unix platforms. The general plan here is to autoconfiscate/
-libtoolise 1.0.2 soon after release, and release the result as 1.1.0
-or perhaps 1.2.0. That, however, is still just a plan at this point.
-
-Here are the changes in 1.0.2. Bug-reporters and/or patch-senders in
-parentheses.
-
-* Fix an infinite segfault loop in 1.0.1 when a directory is
- encountered in -f (force) mode.
- (Trond Eivind Glomsrod, Nicholas Nethercote, Volker Schmidt)
-
-* Avoid double fclose() of output file on certain I/O error paths.
- (Solar Designer)
-
-* Don't fail with internal error 1007 when fed a long stream (> 48MB)
- of byte 251. Also print useful message suggesting that 1007s may be
- caused by bad memory.
- (noticed by Juan Pedro Vallejo, fixed by me)
-
-* Fix uninitialised variable silly bug in demo prog dlltest.c.
- (Jorj Bauer)
-
-* Remove 512-MB limitation on recovered file size for bzip2recover
- on selected platforms which support 64-bit ints. At the moment
- all GCC supported platforms, and Win32.
- (me, Alson van der Meulen)
-
-* Hard-code header byte values, to give correct operation on platforms
- using EBCDIC as their native character set (IBM's OS/390).
- (Leland Lucius)
-
-* Copy file access times correctly.
- (Marty Leisner)
-
-* Add distclean and check targets to Makefile.
- (Michael Carmack)
-
-* Parameterise use of ar and ranlib in Makefile. Also add $(LDFLAGS).
- (Rich Ireland, Bo Thorsen)
-
-* Pass -p (create parent dirs as needed) to mkdir during make install.
- (Jeremy Fusco)
-
-* Dereference symlinks when copying file permissions in -f mode.
- (Volker Schmidt)
-
-* Majorly simplify implementation of uInt64_qrm10.
- (Bo Lindbergh)
-
-* Check the input file still exists before deleting the output one,
- when aborting in cleanUpAndFail().
- (Joerg Prante, Robert Linden, Matthias Krings)
-
-Also a bunch of patches courtesy of Philippe Troin, the Debian maintainer
-of bzip2:
-
-* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore.
-
-* Spelling changes and minor enhancements in bzip2.1.
-
-* Avoid race condition between creating the output file and setting its
- interim permissions safely, by using fopen_output_safely().
- No changes to bzip2recover since there is no issue with file
- permissions there.
-
-* do not print senseless report with -v when compressing an empty
- file.
-
-* bzcat -f works on non-bzip2 files.
-
-* do not try to escape shell meta-characters on unix (the shell takes
- care of these).
-
-* added --fast and --best aliases for -1 -9 for gzip compatibility.
-
-
-1.0.3 (15 Feb 05)
-~~~~~~~~~~~~~~~~~
-Fixes some minor bugs since the last version, 1.0.2.
-
-* Further robustification against corrupted compressed data.
- There are currently no known bitstreams which can cause the
- decompressor to crash, loop or access memory which does not
- belong to it. If you are using bzip2 or the library to
- decompress bitstreams from untrusted sources, an upgrade
- to 1.0.3 is recommended. This fixes CAN-2005-1260.
-
-* The documentation has been converted to XML, from which html
- and pdf can be derived.
-
-* Various minor bugs in the documentation have been fixed.
-
-* Fixes for various compilation warnings with newer versions of
- gcc, and on 64-bit platforms.
-
-* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
- This has been fixed.
-
-
-1.0.4 (20 Dec 06)
-~~~~~~~~~~~~~~~~~
-Fixes some minor bugs since the last version, 1.0.3.
-
-* Fix file permissions race problem (CAN-2005-0953).
-
-* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD
- scan.
-
-* 'const'/prototype cleanups in the C code.
-
-* Change default install location to /usr/local, and handle multiple
- 'make install's without error.
-
-* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758
- to the extent that applies to bzgrep.
-
-* Use 'mktemp' rather than 'tempfile' in bzdiff.
-
-* Tighten up a couple of assertions in blocksort.c following automated
- analysis.
-
-* Fix minor doc/comment bugs.
-
-
-1.0.5 (10 Dec 07)
-~~~~~~~~~~~~~~~~~
-Security fix only. Fixes CERT-FI 20469 as it applies to bzip2.
-
-
-1.0.6 (6 Sept 10)
-~~~~~~~~~~~~~~~~~
-
-* Security fix for CVE-2010-0405. This was reported by Mikolaj
- Izdebski.
-
-* Make the documentation build on Ubuntu 10.04
-
-1.0.7 (27 Jun 19)
-~~~~~~~~~~~~~~~~~
-
-* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH
-
-* bzip2: Fix return value when combining --test,-t and -q.
-
-* bzip2recover: Fix buffer overflow for large argv[0]
-
-* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
-
-* Make sure nSelectors is not out of range (CVE-2019-12900)
-
-1.0.8 (13 Jul 19)
-~~~~~~~~~~~~~~~~~
-
-* Accept as many selectors as the file format allows.
- This relaxes the fix for CVE-2019-12900 from 1.0.7
- so that bzip2 allows decompression of bz2 files that
- use (too) many selectors again.
-
-* Fix handling of large (> 4GB) files on Windows.
-
-* Cleanup of bzdiff and bzgrep scripts so they don't use
- any bash extensions and handle multiple archives correctly.
-
-* There is now a bz2-files testsuite at
- https://sourceware.org/git/bzip2-tests.git
+ ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------
+
+
+0.9.0
+~~~~~
+First version.
+
+
+0.9.0a
+~~~~~~
+Removed 'ranlib' from Makefile, since most modern Unix-es
+don't need it, or even know about it.
+
+
+0.9.0b
+~~~~~~
+Fixed a problem with error reporting in bzip2.c. This does not effect
+the library in any way. Problem is: versions 0.9.0 and 0.9.0a (of the
+program proper) compress and decompress correctly, but give misleading
+error messages (internal panics) when an I/O error occurs, instead of
+reporting the problem correctly. This shouldn't give any data loss
+(as far as I can see), but is confusing.
+
+Made the inline declarations disappear for non-GCC compilers.
+
+
+0.9.0c
+~~~~~~
+Fixed some problems in the library pertaining to some boundary cases.
+This makes the library behave more correctly in those situations. The
+fixes apply only to features (calls and parameters) not used by
+bzip2.c, so the non-fixedness of them in previous versions has no
+effect on reliability of bzip2.c.
+
+In bzlib.c:
+ * made zero-length BZ_FLUSH work correctly in bzCompress().
+ * fixed bzWrite/bzRead to ignore zero-length requests.
+ * fixed bzread to correctly handle read requests after EOF.
+ * wrong parameter order in call to bzDecompressInit in
+ bzBuffToBuffDecompress. Fixed.
+
+In compress.c:
+ * changed setting of nGroups in sendMTFValues() so as to
+ do a bit better on small files. This _does_ effect
+ bzip2.c.
+
+
+0.9.5a
+~~~~~~
+Major change: add a fallback sorting algorithm (blocksort.c)
+to give reasonable behaviour even for very repetitive inputs.
+Nuked --repetitive-best and --repetitive-fast since they are
+no longer useful.
+
+Minor changes: mostly a whole bunch of small changes/
+bugfixes in the driver (bzip2.c). Changes pertaining to the
+user interface are:
+
+ allow decompression of symlink'd files to stdout
+ decompress/test files even without .bz2 extension
+ give more accurate error messages for I/O errors
+ when compressing/decompressing to stdout, don't catch control-C
+ read flags from BZIP2 and BZIP environment variables
+ decline to break hard links to a file unless forced with -f
+ allow -c flag even with no filenames
+ preserve file ownerships as far as possible
+ make -s -1 give the expected block size (100k)
+ add a flag -q --quiet to suppress nonessential warnings
+ stop decoding flags after --, so files beginning in - can be handled
+ resolved inconsistent naming: bzcat or bz2cat ?
+ bzip2 --help now returns 0
+
+Programming-level changes are:
+
+ fixed syntax error in GET_LL4 for Borland C++ 5.02
+ let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC}
+ fix overshoot of mode-string end in bzopen_or_bzdopen
+ wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... }
+ close file handles under all error conditions
+ added minor mods so it compiles with DJGPP out of the box
+ fixed Makefile so it doesn't give problems with BSD make
+ fix uninitialised memory reads in dlltest.c
+
+0.9.5b
+~~~~~~
+Open stdin/stdout in binary mode for DJGPP.
+
+0.9.5c
+~~~~~~
+Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1. The + 1
+version could cause the sorted order to be wrong in some extremely
+obscure cases. Also changed setting of quadrant in blocksort.c.
+
+0.9.5d
+~~~~~~
+The only functional change is to make bzlibVersion() in the library
+return the correct string. This has no effect whatsoever on the
+functioning of the bzip2 program or library. Added a couple of casts
+so the library compiles without warnings at level 3 in MS Visual
+Studio 6.0. Included a Y2K statement in the file Y2K_INFO. All other
+changes are minor documentation changes.
+
+1.0
+~~~
+Several minor bugfixes and enhancements:
+
+* Large file support. The library uses 64-bit counters to
+ count the volume of data passing through it. bzip2.c
+ is now compiled with -D_FILE_OFFSET_BITS=64 to get large
+ file support from the C library. -v correctly prints out
+ file sizes greater than 4 gigabytes. All these changes have
+ been made without assuming a 64-bit platform or a C compiler
+ which supports 64-bit ints, so, except for the C library
+ aspect, they are fully portable.
+
+* Decompression robustness. The library/program should be
+ robust to any corruption of compressed data, detecting and
+ handling _all_ corruption, instead of merely relying on
+ the CRCs. What this means is that the program should
+ never crash, given corrupted data, and the library should
+ always return BZ_DATA_ERROR.
+
+* Fixed an obscure race-condition bug only ever observed on
+ Solaris, in which, if you were very unlucky and issued
+ control-C at exactly the wrong time, both input and output
+ files would be deleted.
+
+* Don't run out of file handles on test/decompression when
+ large numbers of files have invalid magic numbers.
+
+* Avoid library namespace pollution. Prefix all exported
+ symbols with BZ2_.
+
+* Minor sorting enhancements from my DCC2000 paper.
+
+* Advance the version number to 1.0, so as to counteract the
+ (false-in-this-case) impression some people have that programs
+ with version numbers less than 1.0 are in some way, experimental,
+ pre-release versions.
+
+* Create an initial Makefile-libbz2_so to build a shared library.
+ Yes, I know I should really use libtool et al ...
+
+* Make the program exit with 2 instead of 0 when decompression
+ fails due to a bad magic number (ie, an invalid bzip2 header).
+ Also exit with 1 (as the manual claims :-) whenever a diagnostic
+ message would have been printed AND the corresponding operation
+ is aborted, for example
+ bzip2: Output file xx already exists.
+ When a diagnostic message is printed but the operation is not
+ aborted, for example
+ bzip2: Can't guess original name for wurble -- using wurble.out
+ then the exit value 0 is returned, unless some other problem is
+ also detected.
+
+ I think it corresponds more closely to what the manual claims now.
+
+
+1.0.1
+~~~~~
+* Modified dlltest.c so it uses the new BZ2_ naming scheme.
+* Modified makefile-msc to fix minor build probs on Win2k.
+* Updated README.COMPILATION.PROBLEMS.
+
+There are no functionality changes or bug fixes relative to version
+1.0.0. This is just a documentation update + a fix for minor Win32
+build problems. For almost everyone, upgrading from 1.0.0 to 1.0.1 is
+utterly pointless. Don't bother.
+
+
+1.0.2
+~~~~~
+A bug fix release, addressing various minor issues which have appeared
+in the 18 or so months since 1.0.1 was released. Most of the fixes
+are to do with file-handling or documentation bugs. To the best of my
+knowledge, there have been no data-loss-causing bugs reported in the
+compression/decompression engine of 1.0.0 or 1.0.1.
+
+Note that this release does not improve the rather crude build system
+for Unix platforms. The general plan here is to autoconfiscate/
+libtoolise 1.0.2 soon after release, and release the result as 1.1.0
+or perhaps 1.2.0. That, however, is still just a plan at this point.
+
+Here are the changes in 1.0.2. Bug-reporters and/or patch-senders in
+parentheses.
+
+* Fix an infinite segfault loop in 1.0.1 when a directory is
+ encountered in -f (force) mode.
+ (Trond Eivind Glomsrod, Nicholas Nethercote, Volker Schmidt)
+
+* Avoid double fclose() of output file on certain I/O error paths.
+ (Solar Designer)
+
+* Don't fail with internal error 1007 when fed a long stream (> 48MB)
+ of byte 251. Also print useful message suggesting that 1007s may be
+ caused by bad memory.
+ (noticed by Juan Pedro Vallejo, fixed by me)
+
+* Fix uninitialised variable silly bug in demo prog dlltest.c.
+ (Jorj Bauer)
+
+* Remove 512-MB limitation on recovered file size for bzip2recover
+ on selected platforms which support 64-bit ints. At the moment
+ all GCC supported platforms, and Win32.
+ (me, Alson van der Meulen)
+
+* Hard-code header byte values, to give correct operation on platforms
+ using EBCDIC as their native character set (IBM's OS/390).
+ (Leland Lucius)
+
+* Copy file access times correctly.
+ (Marty Leisner)
+
+* Add distclean and check targets to Makefile.
+ (Michael Carmack)
+
+* Parameterise use of ar and ranlib in Makefile. Also add $(LDFLAGS).
+ (Rich Ireland, Bo Thorsen)
+
+* Pass -p (create parent dirs as needed) to mkdir during make install.
+ (Jeremy Fusco)
+
+* Dereference symlinks when copying file permissions in -f mode.
+ (Volker Schmidt)
+
+* Majorly simplify implementation of uInt64_qrm10.
+ (Bo Lindbergh)
+
+* Check the input file still exists before deleting the output one,
+ when aborting in cleanUpAndFail().
+ (Joerg Prante, Robert Linden, Matthias Krings)
+
+Also a bunch of patches courtesy of Philippe Troin, the Debian maintainer
+of bzip2:
+
+* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore.
+
+* Spelling changes and minor enhancements in bzip2.1.
+
+* Avoid race condition between creating the output file and setting its
+ interim permissions safely, by using fopen_output_safely().
+ No changes to bzip2recover since there is no issue with file
+ permissions there.
+
+* do not print senseless report with -v when compressing an empty
+ file.
+
+* bzcat -f works on non-bzip2 files.
+
+* do not try to escape shell meta-characters on unix (the shell takes
+ care of these).
+
+* added --fast and --best aliases for -1 -9 for gzip compatibility.
+
+
+1.0.3 (15 Feb 05)
+~~~~~~~~~~~~~~~~~
+Fixes some minor bugs since the last version, 1.0.2.
+
+* Further robustification against corrupted compressed data.
+ There are currently no known bitstreams which can cause the
+ decompressor to crash, loop or access memory which does not
+ belong to it. If you are using bzip2 or the library to
+ decompress bitstreams from untrusted sources, an upgrade
+ to 1.0.3 is recommended. This fixes CAN-2005-1260.
+
+* The documentation has been converted to XML, from which html
+ and pdf can be derived.
+
+* Various minor bugs in the documentation have been fixed.
+
+* Fixes for various compilation warnings with newer versions of
+ gcc, and on 64-bit platforms.
+
+* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
+ This has been fixed.
+
+
+1.0.4 (20 Dec 06)
+~~~~~~~~~~~~~~~~~
+Fixes some minor bugs since the last version, 1.0.3.
+
+* Fix file permissions race problem (CAN-2005-0953).
+
+* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD
+ scan.
+
+* 'const'/prototype cleanups in the C code.
+
+* Change default install location to /usr/local, and handle multiple
+ 'make install's without error.
+
+* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758
+ to the extent that applies to bzgrep.
+
+* Use 'mktemp' rather than 'tempfile' in bzdiff.
+
+* Tighten up a couple of assertions in blocksort.c following automated
+ analysis.
+
+* Fix minor doc/comment bugs.
+
+
+1.0.5 (10 Dec 07)
+~~~~~~~~~~~~~~~~~
+Security fix only. Fixes CERT-FI 20469 as it applies to bzip2.
+
+
+1.0.6 (6 Sept 10)
+~~~~~~~~~~~~~~~~~
+
+* Security fix for CVE-2010-0405. This was reported by Mikolaj
+ Izdebski.
+
+* Make the documentation build on Ubuntu 10.04
+
+1.0.7 (27 Jun 19)
+~~~~~~~~~~~~~~~~~
+
+* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH
+
+* bzip2: Fix return value when combining --test,-t and -q.
+
+* bzip2recover: Fix buffer overflow for large argv[0]
+
+* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
+
+* Make sure nSelectors is not out of range (CVE-2019-12900)
+
+1.0.8 (13 Jul 19)
+~~~~~~~~~~~~~~~~~
+
+* Accept as many selectors as the file format allows.
+ This relaxes the fix for CVE-2019-12900 from 1.0.7
+ so that bzip2 allows decompression of bz2 files that
+ use (too) many selectors again.
+
+* Fix handling of large (> 4GB) files on Windows.
+
+* Cleanup of bzdiff and bzgrep scripts so they don't use
+ any bash extensions and handle multiple archives correctly.
+
+* There is now a bz2-files testsuite at
+ https://sourceware.org/git/bzip2-tests.git
diff --git a/contrib/libs/libbz2/LICENSE b/contrib/libs/libbz2/LICENSE
index 81a37eab7a..5433adcd6f 100644
--- a/contrib/libs/libbz2/LICENSE
+++ b/contrib/libs/libbz2/LICENSE
@@ -2,7 +2,7 @@
--------------------------------------------------------------------------
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2019 Julian R Seward. All
+documentation, are copyright (C) 1996-2019 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Julian Seward, jseward@acm.org
-bzip2/libbzip2 version 1.0.8 of 13 July 2019
+Julian Seward, jseward@acm.org
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
--------------------------------------------------------------------------
diff --git a/contrib/libs/libbz2/README b/contrib/libs/libbz2/README
index b9c6099fd1..dbda60fa75 100644
--- a/contrib/libs/libbz2/README
+++ b/contrib/libs/libbz2/README
@@ -6,8 +6,8 @@ This version is fully compatible with the previous public releases.
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
-bzip2/libbzip2 version 1.0.8 of 13 July 2019
-Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
+Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
@@ -73,7 +73,7 @@ HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
It's difficult for me to support compilation on all these platforms.
My approach is to collect binaries for these platforms, and put them
-on the master web site (https://sourceware.org/bzip2/). Look there. However
+on the master web site (https://sourceware.org/bzip2/). Look there. However
(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
unmodified with MS Visual C. If you have difficulties building, you
might want to read README.COMPILATION.PROBLEMS.
@@ -161,22 +161,22 @@ WHAT'S NEW IN 0.9.5 ?
* Many small improvements in file and flag handling.
* A Y2K statement.
-WHAT'S NEW IN 1.0.x ?
+WHAT'S NEW IN 1.0.x ?
See the CHANGES file.
-I hope you find bzip2 useful. Feel free to contact the developers at
- bzip2-devel@sourceware.org
+I hope you find bzip2 useful. Feel free to contact the developers at
+ bzip2-devel@sourceware.org
if you have any suggestions or queries. Many people mailed me with
comments, suggestions and patches after the releases of bzip-0.15,
bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
feedback. I thank you for your comments.
-bzip2's "home" is https://sourceware.org/bzip2/
+bzip2's "home" is https://sourceware.org/bzip2/
Julian Seward
-jseward@acm.org
+jseward@acm.org
Cambridge, UK.
18 July 1996 (version 0.15)
@@ -192,5 +192,5 @@ Cambridge, UK.
20 December 2006 (bzip2, version 1.0.4)
10 December 2007 (bzip2, version 1.0.5)
6 Sept 2010 (bzip2, version 1.0.6)
-27 June 2019 (bzip2, version 1.0.7)
-13 July 2019 (bzip2, version 1.0.8)
+27 June 2019 (bzip2, version 1.0.7)
+13 July 2019 (bzip2, version 1.0.8)
diff --git a/contrib/libs/libbz2/README.COMPILATION.PROBLEMS b/contrib/libs/libbz2/README.COMPILATION.PROBLEMS
index fa317a50c8..a42be41aab 100644
--- a/contrib/libs/libbz2/README.COMPILATION.PROBLEMS
+++ b/contrib/libs/libbz2/README.COMPILATION.PROBLEMS
@@ -1,58 +1,58 @@
-------------------------------------------------------------------
-This file is part of bzip2/libbzip2, a program and library for
-lossless, block-sorting data compression.
-
-bzip2/libbzip2 version 1.0.8 of 13 July 2019
-Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
-
-Please read the WARNING, DISCLAIMER and PATENTS sections in the
-README file.
-
-This program is released under the terms of the license contained
-in the file LICENSE.
-------------------------------------------------------------------
-
-bzip2 should compile without problems on the vast majority of
-platforms. Using the supplied Makefile, I've built and tested it
-myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
-6.0 and nmake, you can build a native Win32 version too. Large file
-support seems to work correctly on at least on amd64-linux.
-
-When I say "large file" I mean a file of size 2,147,483,648 (2^31)
-bytes or above. Many older OSs can't handle files above this size,
-but many newer ones can. Large files are pretty huge -- most files
-you'll encounter are not Large Files.
-
-Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety
-of platforms without difficulty, and I hope this version will continue
-in that tradition. However, in order to support large files, I've had
-to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This
-can cause problems.
-
-The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
-support is, as far as I know, the Recommended Way to get correct large
-file support. For more details, see the Large File Support
-Specification, published by the Large File Summit, at
-
- http://ftp.sas.com/standards/large.file
-
-As a general comment, if you get compilation errors which you think
-are related to large file support, try removing the above define from
-the Makefile, ie, delete the line
-
- BIGFILES=-D_FILE_OFFSET_BITS=64
-
-from the Makefile, and do 'make clean ; make'. This will give you a
-version of bzip2 without large file support, which, for most
-applications, is probably not a problem.
-
-Alternatively, try some of the platform-specific hints listed below.
-
-You can use the spewG.c program to generate huge files to test bzip2's
-large file support, if you are feeling paranoid. Be aware though that
-any compilation problems which affect bzip2 will also affect spewG.c,
-alas.
-
-AIX: I have reports that for large file support, you need to specify
--D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested
-this myself.
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
+
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
+Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in the
+README file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
+bzip2 should compile without problems on the vast majority of
+platforms. Using the supplied Makefile, I've built and tested it
+myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
+6.0 and nmake, you can build a native Win32 version too. Large file
+support seems to work correctly on at least on amd64-linux.
+
+When I say "large file" I mean a file of size 2,147,483,648 (2^31)
+bytes or above. Many older OSs can't handle files above this size,
+but many newer ones can. Large files are pretty huge -- most files
+you'll encounter are not Large Files.
+
+Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety
+of platforms without difficulty, and I hope this version will continue
+in that tradition. However, in order to support large files, I've had
+to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This
+can cause problems.
+
+The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
+support is, as far as I know, the Recommended Way to get correct large
+file support. For more details, see the Large File Support
+Specification, published by the Large File Summit, at
+
+ http://ftp.sas.com/standards/large.file
+
+As a general comment, if you get compilation errors which you think
+are related to large file support, try removing the above define from
+the Makefile, ie, delete the line
+
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+
+from the Makefile, and do 'make clean ; make'. This will give you a
+version of bzip2 without large file support, which, for most
+applications, is probably not a problem.
+
+Alternatively, try some of the platform-specific hints listed below.
+
+You can use the spewG.c program to generate huge files to test bzip2's
+large file support, if you are feeling paranoid. Be aware though that
+any compilation problems which affect bzip2 will also affect spewG.c,
+alas.
+
+AIX: I have reports that for large file support, you need to specify
+-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested
+this myself.
diff --git a/contrib/libs/libbz2/README.XML.STUFF b/contrib/libs/libbz2/README.XML.STUFF
index 1503476ebe..b0087b9ee8 100644
--- a/contrib/libs/libbz2/README.XML.STUFF
+++ b/contrib/libs/libbz2/README.XML.STUFF
@@ -2,8 +2,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/contrib/libs/libbz2/blocksort.c b/contrib/libs/libbz2/blocksort.c
index 92d81fe287..ee39564b42 100644
--- a/contrib/libs/libbz2/blocksort.c
+++ b/contrib/libs/libbz2/blocksort.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
bhtab [ 0 .. 2+(nblock/32) ] destroyed
*/
-#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
-#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
-#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
+#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
+#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
+#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
#define WORD_BH(zz) bhtab[(zz) >> 5]
#define UNALIGNED_BH(zz) ((zz) & 0x01f)
diff --git a/contrib/libs/libbz2/bzlib.c b/contrib/libs/libbz2/bzlib.c
index 21786551b6..cb39531f91 100644
--- a/contrib/libs/libbz2/bzlib.c
+++ b/contrib/libs/libbz2/bzlib.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -43,12 +43,12 @@ void BZ2_bz__AssertH__fail ( int errcode )
fprintf(stderr,
"\n\nbzip2/libbzip2: internal error number %d.\n"
"This is a bug in bzip2/libbzip2, %s.\n"
- "Please report it to: bzip2-devel@sourceware.org. If this happened\n"
+ "Please report it to: bzip2-devel@sourceware.org. If this happened\n"
"when you were using some program which uses libbzip2 as a\n"
"component, you should also report this bug to the author(s)\n"
"of that program. Please make an effort to report this bug;\n"
"timely and accurate bug reports eventually lead to higher\n"
- "quality software. Thanks.\n\n",
+ "quality software. Thanks.\n\n",
errcode,
BZ2_bzlibVersion()
);
diff --git a/contrib/libs/libbz2/bzlib.h b/contrib/libs/libbz2/bzlib.h
index a7d2cd6188..ef817380ef 100644
--- a/contrib/libs/libbz2/bzlib.h
+++ b/contrib/libs/libbz2/bzlib.h
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/contrib/libs/libbz2/bzlib_private.h b/contrib/libs/libbz2/bzlib_private.h
index 2578c2dcf2..c00ef202c6 100644
--- a/contrib/libs/libbz2/bzlib_private.h
+++ b/contrib/libs/libbz2/bzlib_private.h
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -36,7 +36,7 @@
/*-- General stuff. --*/
-#define BZ_VERSION "1.0.8, 13-Jul-2019"
+#define BZ_VERSION "1.0.8, 13-Jul-2019"
typedef char Char;
typedef unsigned char Bool;
diff --git a/contrib/libs/libbz2/compress.c b/contrib/libs/libbz2/compress.c
index 5dfa00231b..123a33eb9e 100644
--- a/contrib/libs/libbz2/compress.c
+++ b/contrib/libs/libbz2/compress.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -454,7 +454,7 @@ void sendMTFValues ( EState* s )
AssertH( nGroups < 8, 3002 );
AssertH( nSelectors < 32768 &&
- nSelectors <= BZ_MAX_SELECTORS,
+ nSelectors <= BZ_MAX_SELECTORS,
3003 );
diff --git a/contrib/libs/libbz2/crctable.c b/contrib/libs/libbz2/crctable.c
index a9212dbf2c..a14124c74c 100644
--- a/contrib/libs/libbz2/crctable.c
+++ b/contrib/libs/libbz2/crctable.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/contrib/libs/libbz2/decompress.c b/contrib/libs/libbz2/decompress.c
index a1a0bac892..c0b39c7363 100644
--- a/contrib/libs/libbz2/decompress.c
+++ b/contrib/libs/libbz2/decompress.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -285,9 +285,9 @@ Int32 BZ2_decompress ( DState* s )
/*--- Now the selectors ---*/
GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
- if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR);
+ if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR);
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
- if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
+ if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
for (i = 0; i < nSelectors; i++) {
j = 0;
while (True) {
@@ -296,14 +296,14 @@ Int32 BZ2_decompress ( DState* s )
j++;
if (j >= nGroups) RETURN(BZ_DATA_ERROR);
}
- /* Having more than BZ_MAX_SELECTORS doesn't make much sense
- since they will never be used, but some implementations might
- "round up" the number of selectors, so just ignore those. */
- if (i < BZ_MAX_SELECTORS)
- s->selectorMtf[i] = j;
+ /* Having more than BZ_MAX_SELECTORS doesn't make much sense
+ since they will never be used, but some implementations might
+ "round up" the number of selectors, so just ignore those. */
+ if (i < BZ_MAX_SELECTORS)
+ s->selectorMtf[i] = j;
}
- if (nSelectors > BZ_MAX_SELECTORS)
- nSelectors = BZ_MAX_SELECTORS;
+ if (nSelectors > BZ_MAX_SELECTORS)
+ nSelectors = BZ_MAX_SELECTORS;
/*--- Undo the MTF values for the selectors. ---*/
{
diff --git a/contrib/libs/libbz2/huffman.c b/contrib/libs/libbz2/huffman.c
index 43a1899e46..5f7745cb68 100644
--- a/contrib/libs/libbz2/huffman.c
+++ b/contrib/libs/libbz2/huffman.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/contrib/libs/libbz2/randtable.c b/contrib/libs/libbz2/randtable.c
index 43de39ff68..ff5bc5ecbe 100644
--- a/contrib/libs/libbz2/randtable.c
+++ b/contrib/libs/libbz2/randtable.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.8 of 13 July 2019
- Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/contrib/libs/libbz2/ya.make b/contrib/libs/libbz2/ya.make
index 3d5be08322..00e204028e 100644
--- a/contrib/libs/libbz2/ya.make
+++ b/contrib/libs/libbz2/ya.make
@@ -7,7 +7,7 @@ OWNER(
g:cpp-contrib
)
-VERSION(1.0.8)
+VERSION(1.0.8)
ORIGINAL_SOURCE(https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
diff --git a/contrib/libs/libiconv/aliases_nocjk.gperf b/contrib/libs/libiconv/aliases_nocjk.gperf
index 2c7b11d1ba..4b9b18a2e1 100644
--- a/contrib/libs/libiconv/aliases_nocjk.gperf
+++ b/contrib/libs/libiconv/aliases_nocjk.gperf
@@ -1,264 +1,264 @@
-struct alias { int name; unsigned int encoding_index; };
-%struct-type
-%language=ANSI-C
-%define hash-function-name aliases_hash
-%define lookup-function-name aliases_lookup
-%7bit
-%readonly-tables
-%global-table
-%define word-array-name aliases
-%pic
-%%
-US-ASCII, ei_ascii
-ASCII, ei_ascii
-ISO646-US, ei_ascii
-ISO_646.IRV:1991, ei_ascii
-ISO-IR-6, ei_ascii
-ANSI_X3.4-1968, ei_ascii
-ANSI_X3.4-1986, ei_ascii
-CP367, ei_ascii
-IBM367, ei_ascii
-US, ei_ascii
-CSASCII, ei_ascii
-UTF-8, ei_utf8
-UCS-2, ei_ucs2
-ISO-10646-UCS-2, ei_ucs2
-CSUNICODE, ei_ucs2
-UCS-2BE, ei_ucs2be
-UNICODEBIG, ei_ucs2be
-UNICODE-1-1, ei_ucs2be
-CSUNICODE11, ei_ucs2be
-UCS-2LE, ei_ucs2le
-UNICODELITTLE, ei_ucs2le
-UCS-4, ei_ucs4
-ISO-10646-UCS-4, ei_ucs4
-CSUCS4, ei_ucs4
-UCS-4BE, ei_ucs4be
-UCS-4LE, ei_ucs4le
-UTF-16, ei_utf16
-UTF-16BE, ei_utf16be
-UTF-16LE, ei_utf16le
-UTF-32, ei_utf32
-UTF-32BE, ei_utf32be
-UTF-32LE, ei_utf32le
-UTF-7, ei_utf7
-UNICODE-1-1-UTF-7, ei_utf7
-CSUNICODE11UTF7, ei_utf7
-UCS-2-INTERNAL, ei_ucs2internal
-UCS-2-SWAPPED, ei_ucs2swapped
-UCS-4-INTERNAL, ei_ucs4internal
-UCS-4-SWAPPED, ei_ucs4swapped
-C99, ei_c99
-JAVA, ei_java
-ISO-8859-1, ei_iso8859_1
-ISO_8859-1, ei_iso8859_1
-ISO_8859-1:1987, ei_iso8859_1
-ISO-IR-100, ei_iso8859_1
-CP819, ei_iso8859_1
-IBM819, ei_iso8859_1
-LATIN1, ei_iso8859_1
-L1, ei_iso8859_1
-CSISOLATIN1, ei_iso8859_1
-ISO8859-1, ei_iso8859_1
-ISO-8859-2, ei_iso8859_2
-ISO_8859-2, ei_iso8859_2
-ISO_8859-2:1987, ei_iso8859_2
-ISO-IR-101, ei_iso8859_2
-LATIN2, ei_iso8859_2
-L2, ei_iso8859_2
-CSISOLATIN2, ei_iso8859_2
-ISO8859-2, ei_iso8859_2
-ISO-8859-3, ei_iso8859_3
-ISO_8859-3, ei_iso8859_3
-ISO_8859-3:1988, ei_iso8859_3
-ISO-IR-109, ei_iso8859_3
-LATIN3, ei_iso8859_3
-L3, ei_iso8859_3
-CSISOLATIN3, ei_iso8859_3
-ISO8859-3, ei_iso8859_3
-ISO-8859-4, ei_iso8859_4
-ISO_8859-4, ei_iso8859_4
-ISO_8859-4:1988, ei_iso8859_4
-ISO-IR-110, ei_iso8859_4
-LATIN4, ei_iso8859_4
-L4, ei_iso8859_4
-CSISOLATIN4, ei_iso8859_4
-ISO8859-4, ei_iso8859_4
-ISO-8859-5, ei_iso8859_5
-ISO_8859-5, ei_iso8859_5
-ISO_8859-5:1988, ei_iso8859_5
-ISO-IR-144, ei_iso8859_5
-CYRILLIC, ei_iso8859_5
-CSISOLATINCYRILLIC, ei_iso8859_5
-ISO8859-5, ei_iso8859_5
-ISO-8859-6, ei_iso8859_6
-ISO_8859-6, ei_iso8859_6
-ISO_8859-6:1987, ei_iso8859_6
-ISO-IR-127, ei_iso8859_6
-ECMA-114, ei_iso8859_6
-ASMO-708, ei_iso8859_6
-ARABIC, ei_iso8859_6
-CSISOLATINARABIC, ei_iso8859_6
-ISO8859-6, ei_iso8859_6
-ISO-8859-7, ei_iso8859_7
-ISO_8859-7, ei_iso8859_7
-ISO_8859-7:1987, ei_iso8859_7
-ISO_8859-7:2003, ei_iso8859_7
-ISO-IR-126, ei_iso8859_7
-ECMA-118, ei_iso8859_7
-ELOT_928, ei_iso8859_7
-GREEK8, ei_iso8859_7
-GREEK, ei_iso8859_7
-CSISOLATINGREEK, ei_iso8859_7
-ISO8859-7, ei_iso8859_7
-ISO-8859-8, ei_iso8859_8
-ISO_8859-8, ei_iso8859_8
-ISO_8859-8:1988, ei_iso8859_8
-ISO-IR-138, ei_iso8859_8
-HEBREW, ei_iso8859_8
-CSISOLATINHEBREW, ei_iso8859_8
-ISO8859-8, ei_iso8859_8
-ISO-8859-9, ei_iso8859_9
-ISO_8859-9, ei_iso8859_9
-ISO_8859-9:1989, ei_iso8859_9
-ISO-IR-148, ei_iso8859_9
-LATIN5, ei_iso8859_9
-L5, ei_iso8859_9
-CSISOLATIN5, ei_iso8859_9
-ISO8859-9, ei_iso8859_9
-ISO-8859-10, ei_iso8859_10
-ISO_8859-10, ei_iso8859_10
-ISO_8859-10:1992, ei_iso8859_10
-ISO-IR-157, ei_iso8859_10
-LATIN6, ei_iso8859_10
-L6, ei_iso8859_10
-CSISOLATIN6, ei_iso8859_10
-ISO8859-10, ei_iso8859_10
-ISO-8859-11, ei_iso8859_11
-ISO_8859-11, ei_iso8859_11
-ISO8859-11, ei_iso8859_11
-ISO-8859-13, ei_iso8859_13
-ISO_8859-13, ei_iso8859_13
-ISO-IR-179, ei_iso8859_13
-LATIN7, ei_iso8859_13
-L7, ei_iso8859_13
-ISO8859-13, ei_iso8859_13
-ISO-8859-14, ei_iso8859_14
-ISO_8859-14, ei_iso8859_14
-ISO_8859-14:1998, ei_iso8859_14
-ISO-IR-199, ei_iso8859_14
-LATIN8, ei_iso8859_14
-L8, ei_iso8859_14
-ISO-CELTIC, ei_iso8859_14
-ISO8859-14, ei_iso8859_14
-ISO-8859-15, ei_iso8859_15
-ISO_8859-15, ei_iso8859_15
-ISO_8859-15:1998, ei_iso8859_15
-ISO-IR-203, ei_iso8859_15
-LATIN-9, ei_iso8859_15
-ISO8859-15, ei_iso8859_15
-ISO-8859-16, ei_iso8859_16
-ISO_8859-16, ei_iso8859_16
-ISO_8859-16:2001, ei_iso8859_16
-ISO-IR-226, ei_iso8859_16
-LATIN10, ei_iso8859_16
-L10, ei_iso8859_16
-ISO8859-16, ei_iso8859_16
-KOI8-R, ei_koi8_r
-CSKOI8R, ei_koi8_r
-KOI8-U, ei_koi8_u
-KOI8-RU, ei_koi8_ru
-CP1250, ei_cp1250
-WINDOWS-1250, ei_cp1250
-MS-EE, ei_cp1250
-CP1251, ei_cp1251
-WINDOWS-1251, ei_cp1251
-MS-CYRL, ei_cp1251
-CP1252, ei_cp1252
-WINDOWS-1252, ei_cp1252
-MS-ANSI, ei_cp1252
-CP1253, ei_cp1253
-WINDOWS-1253, ei_cp1253
-MS-GREEK, ei_cp1253
-CP1254, ei_cp1254
-WINDOWS-1254, ei_cp1254
-MS-TURK, ei_cp1254
-CP1255, ei_cp1255
-WINDOWS-1255, ei_cp1255
-MS-HEBR, ei_cp1255
-CP1256, ei_cp1256
-WINDOWS-1256, ei_cp1256
-MS-ARAB, ei_cp1256
-CP1257, ei_cp1257
-WINDOWS-1257, ei_cp1257
-WINBALTRIM, ei_cp1257
-CP1258, ei_cp1258
-WINDOWS-1258, ei_cp1258
-CP850, ei_cp850
-IBM850, ei_cp850
-850, ei_cp850
-CSPC850MULTILINGUAL, ei_cp850
-CP862, ei_cp862
-IBM862, ei_cp862
-862, ei_cp862
-CSPC862LATINHEBREW, ei_cp862
-CP866, ei_cp866
-IBM866, ei_cp866
-866, ei_cp866
-CSIBM866, ei_cp866
-CP1131, ei_cp1131
-MACROMAN, ei_mac_roman
-MACINTOSH, ei_mac_roman
-MAC, ei_mac_roman
-CSMACINTOSH, ei_mac_roman
-MACCENTRALEUROPE, ei_mac_centraleurope
-MACICELAND, ei_mac_iceland
-MACCROATIAN, ei_mac_croatian
-MACROMANIA, ei_mac_romania
-MACCYRILLIC, ei_mac_cyrillic
-MAC-CYRILLIC, ei_mac_cyrillic
-MACUKRAINE, ei_mac_ukraine
-MACGREEK, ei_mac_greek
-MACTURKISH, ei_mac_turkish
-MACHEBREW, ei_mac_hebrew
-MACARABIC, ei_mac_arabic
-MACTHAI, ei_mac_thai
-HP-ROMAN8, ei_hp_roman8
-ROMAN8, ei_hp_roman8
-R8, ei_hp_roman8
-CSHPROMAN8, ei_hp_roman8
-NEXTSTEP, ei_nextstep
-ARMSCII-8, ei_armscii_8
-GEORGIAN-ACADEMY, ei_georgian_academy
-GEORGIAN-PS, ei_georgian_ps
-KOI8-T, ei_koi8_t
-PT154, ei_pt154
-PTCP154, ei_pt154
-CP154, ei_pt154
-CYRILLIC-ASIAN, ei_pt154
-CSPTCP154, ei_pt154
-RK1048, ei_rk1048
-STRK1048-2002, ei_rk1048
-KZ-1048, ei_rk1048
-CSKZ1048, ei_rk1048
-MULELAO-1, ei_mulelao
-CP1133, ei_cp1133
-IBM-CP1133, ei_cp1133
-TIS-620, ei_tis620
-TIS620, ei_tis620
-TIS620-0, ei_tis620
-TIS620.2529-1, ei_tis620
-TIS620.2533-0, ei_tis620
-TIS620.2533-1, ei_tis620
-ISO-IR-166, ei_tis620
-CP874, ei_cp874
-WINDOWS-874, ei_cp874
-VISCII, ei_viscii
-VISCII1.1-1, ei_viscii
-CSVISCII, ei_viscii
-TCVN, ei_tcvn
-TCVN-5712, ei_tcvn
-TCVN5712-1, ei_tcvn
-TCVN5712-1:1993, ei_tcvn
-CHAR, ei_local_char
-WCHAR_T, ei_local_wchar_t
+struct alias { int name; unsigned int encoding_index; };
+%struct-type
+%language=ANSI-C
+%define hash-function-name aliases_hash
+%define lookup-function-name aliases_lookup
+%7bit
+%readonly-tables
+%global-table
+%define word-array-name aliases
+%pic
+%%
+US-ASCII, ei_ascii
+ASCII, ei_ascii
+ISO646-US, ei_ascii
+ISO_646.IRV:1991, ei_ascii
+ISO-IR-6, ei_ascii
+ANSI_X3.4-1968, ei_ascii
+ANSI_X3.4-1986, ei_ascii
+CP367, ei_ascii
+IBM367, ei_ascii
+US, ei_ascii
+CSASCII, ei_ascii
+UTF-8, ei_utf8
+UCS-2, ei_ucs2
+ISO-10646-UCS-2, ei_ucs2
+CSUNICODE, ei_ucs2
+UCS-2BE, ei_ucs2be
+UNICODEBIG, ei_ucs2be
+UNICODE-1-1, ei_ucs2be
+CSUNICODE11, ei_ucs2be
+UCS-2LE, ei_ucs2le
+UNICODELITTLE, ei_ucs2le
+UCS-4, ei_ucs4
+ISO-10646-UCS-4, ei_ucs4
+CSUCS4, ei_ucs4
+UCS-4BE, ei_ucs4be
+UCS-4LE, ei_ucs4le
+UTF-16, ei_utf16
+UTF-16BE, ei_utf16be
+UTF-16LE, ei_utf16le
+UTF-32, ei_utf32
+UTF-32BE, ei_utf32be
+UTF-32LE, ei_utf32le
+UTF-7, ei_utf7
+UNICODE-1-1-UTF-7, ei_utf7
+CSUNICODE11UTF7, ei_utf7
+UCS-2-INTERNAL, ei_ucs2internal
+UCS-2-SWAPPED, ei_ucs2swapped
+UCS-4-INTERNAL, ei_ucs4internal
+UCS-4-SWAPPED, ei_ucs4swapped
+C99, ei_c99
+JAVA, ei_java
+ISO-8859-1, ei_iso8859_1
+ISO_8859-1, ei_iso8859_1
+ISO_8859-1:1987, ei_iso8859_1
+ISO-IR-100, ei_iso8859_1
+CP819, ei_iso8859_1
+IBM819, ei_iso8859_1
+LATIN1, ei_iso8859_1
+L1, ei_iso8859_1
+CSISOLATIN1, ei_iso8859_1
+ISO8859-1, ei_iso8859_1
+ISO-8859-2, ei_iso8859_2
+ISO_8859-2, ei_iso8859_2
+ISO_8859-2:1987, ei_iso8859_2
+ISO-IR-101, ei_iso8859_2
+LATIN2, ei_iso8859_2
+L2, ei_iso8859_2
+CSISOLATIN2, ei_iso8859_2
+ISO8859-2, ei_iso8859_2
+ISO-8859-3, ei_iso8859_3
+ISO_8859-3, ei_iso8859_3
+ISO_8859-3:1988, ei_iso8859_3
+ISO-IR-109, ei_iso8859_3
+LATIN3, ei_iso8859_3
+L3, ei_iso8859_3
+CSISOLATIN3, ei_iso8859_3
+ISO8859-3, ei_iso8859_3
+ISO-8859-4, ei_iso8859_4
+ISO_8859-4, ei_iso8859_4
+ISO_8859-4:1988, ei_iso8859_4
+ISO-IR-110, ei_iso8859_4
+LATIN4, ei_iso8859_4
+L4, ei_iso8859_4
+CSISOLATIN4, ei_iso8859_4
+ISO8859-4, ei_iso8859_4
+ISO-8859-5, ei_iso8859_5
+ISO_8859-5, ei_iso8859_5
+ISO_8859-5:1988, ei_iso8859_5
+ISO-IR-144, ei_iso8859_5
+CYRILLIC, ei_iso8859_5
+CSISOLATINCYRILLIC, ei_iso8859_5
+ISO8859-5, ei_iso8859_5
+ISO-8859-6, ei_iso8859_6
+ISO_8859-6, ei_iso8859_6
+ISO_8859-6:1987, ei_iso8859_6
+ISO-IR-127, ei_iso8859_6
+ECMA-114, ei_iso8859_6
+ASMO-708, ei_iso8859_6
+ARABIC, ei_iso8859_6
+CSISOLATINARABIC, ei_iso8859_6
+ISO8859-6, ei_iso8859_6
+ISO-8859-7, ei_iso8859_7
+ISO_8859-7, ei_iso8859_7
+ISO_8859-7:1987, ei_iso8859_7
+ISO_8859-7:2003, ei_iso8859_7
+ISO-IR-126, ei_iso8859_7
+ECMA-118, ei_iso8859_7
+ELOT_928, ei_iso8859_7
+GREEK8, ei_iso8859_7
+GREEK, ei_iso8859_7
+CSISOLATINGREEK, ei_iso8859_7
+ISO8859-7, ei_iso8859_7
+ISO-8859-8, ei_iso8859_8
+ISO_8859-8, ei_iso8859_8
+ISO_8859-8:1988, ei_iso8859_8
+ISO-IR-138, ei_iso8859_8
+HEBREW, ei_iso8859_8
+CSISOLATINHEBREW, ei_iso8859_8
+ISO8859-8, ei_iso8859_8
+ISO-8859-9, ei_iso8859_9
+ISO_8859-9, ei_iso8859_9
+ISO_8859-9:1989, ei_iso8859_9
+ISO-IR-148, ei_iso8859_9
+LATIN5, ei_iso8859_9
+L5, ei_iso8859_9
+CSISOLATIN5, ei_iso8859_9
+ISO8859-9, ei_iso8859_9
+ISO-8859-10, ei_iso8859_10
+ISO_8859-10, ei_iso8859_10
+ISO_8859-10:1992, ei_iso8859_10
+ISO-IR-157, ei_iso8859_10
+LATIN6, ei_iso8859_10
+L6, ei_iso8859_10
+CSISOLATIN6, ei_iso8859_10
+ISO8859-10, ei_iso8859_10
+ISO-8859-11, ei_iso8859_11
+ISO_8859-11, ei_iso8859_11
+ISO8859-11, ei_iso8859_11
+ISO-8859-13, ei_iso8859_13
+ISO_8859-13, ei_iso8859_13
+ISO-IR-179, ei_iso8859_13
+LATIN7, ei_iso8859_13
+L7, ei_iso8859_13
+ISO8859-13, ei_iso8859_13
+ISO-8859-14, ei_iso8859_14
+ISO_8859-14, ei_iso8859_14
+ISO_8859-14:1998, ei_iso8859_14
+ISO-IR-199, ei_iso8859_14
+LATIN8, ei_iso8859_14
+L8, ei_iso8859_14
+ISO-CELTIC, ei_iso8859_14
+ISO8859-14, ei_iso8859_14
+ISO-8859-15, ei_iso8859_15
+ISO_8859-15, ei_iso8859_15
+ISO_8859-15:1998, ei_iso8859_15
+ISO-IR-203, ei_iso8859_15
+LATIN-9, ei_iso8859_15
+ISO8859-15, ei_iso8859_15
+ISO-8859-16, ei_iso8859_16
+ISO_8859-16, ei_iso8859_16
+ISO_8859-16:2001, ei_iso8859_16
+ISO-IR-226, ei_iso8859_16
+LATIN10, ei_iso8859_16
+L10, ei_iso8859_16
+ISO8859-16, ei_iso8859_16
+KOI8-R, ei_koi8_r
+CSKOI8R, ei_koi8_r
+KOI8-U, ei_koi8_u
+KOI8-RU, ei_koi8_ru
+CP1250, ei_cp1250
+WINDOWS-1250, ei_cp1250
+MS-EE, ei_cp1250
+CP1251, ei_cp1251
+WINDOWS-1251, ei_cp1251
+MS-CYRL, ei_cp1251
+CP1252, ei_cp1252
+WINDOWS-1252, ei_cp1252
+MS-ANSI, ei_cp1252
+CP1253, ei_cp1253
+WINDOWS-1253, ei_cp1253
+MS-GREEK, ei_cp1253
+CP1254, ei_cp1254
+WINDOWS-1254, ei_cp1254
+MS-TURK, ei_cp1254
+CP1255, ei_cp1255
+WINDOWS-1255, ei_cp1255
+MS-HEBR, ei_cp1255
+CP1256, ei_cp1256
+WINDOWS-1256, ei_cp1256
+MS-ARAB, ei_cp1256
+CP1257, ei_cp1257
+WINDOWS-1257, ei_cp1257
+WINBALTRIM, ei_cp1257
+CP1258, ei_cp1258
+WINDOWS-1258, ei_cp1258
+CP850, ei_cp850
+IBM850, ei_cp850
+850, ei_cp850
+CSPC850MULTILINGUAL, ei_cp850
+CP862, ei_cp862
+IBM862, ei_cp862
+862, ei_cp862
+CSPC862LATINHEBREW, ei_cp862
+CP866, ei_cp866
+IBM866, ei_cp866
+866, ei_cp866
+CSIBM866, ei_cp866
+CP1131, ei_cp1131
+MACROMAN, ei_mac_roman
+MACINTOSH, ei_mac_roman
+MAC, ei_mac_roman
+CSMACINTOSH, ei_mac_roman
+MACCENTRALEUROPE, ei_mac_centraleurope
+MACICELAND, ei_mac_iceland
+MACCROATIAN, ei_mac_croatian
+MACROMANIA, ei_mac_romania
+MACCYRILLIC, ei_mac_cyrillic
+MAC-CYRILLIC, ei_mac_cyrillic
+MACUKRAINE, ei_mac_ukraine
+MACGREEK, ei_mac_greek
+MACTURKISH, ei_mac_turkish
+MACHEBREW, ei_mac_hebrew
+MACARABIC, ei_mac_arabic
+MACTHAI, ei_mac_thai
+HP-ROMAN8, ei_hp_roman8
+ROMAN8, ei_hp_roman8
+R8, ei_hp_roman8
+CSHPROMAN8, ei_hp_roman8
+NEXTSTEP, ei_nextstep
+ARMSCII-8, ei_armscii_8
+GEORGIAN-ACADEMY, ei_georgian_academy
+GEORGIAN-PS, ei_georgian_ps
+KOI8-T, ei_koi8_t
+PT154, ei_pt154
+PTCP154, ei_pt154
+CP154, ei_pt154
+CYRILLIC-ASIAN, ei_pt154
+CSPTCP154, ei_pt154
+RK1048, ei_rk1048
+STRK1048-2002, ei_rk1048
+KZ-1048, ei_rk1048
+CSKZ1048, ei_rk1048
+MULELAO-1, ei_mulelao
+CP1133, ei_cp1133
+IBM-CP1133, ei_cp1133
+TIS-620, ei_tis620
+TIS620, ei_tis620
+TIS620-0, ei_tis620
+TIS620.2529-1, ei_tis620
+TIS620.2533-0, ei_tis620
+TIS620.2533-1, ei_tis620
+ISO-IR-166, ei_tis620
+CP874, ei_cp874
+WINDOWS-874, ei_cp874
+VISCII, ei_viscii
+VISCII1.1-1, ei_viscii
+CSVISCII, ei_viscii
+TCVN, ei_tcvn
+TCVN-5712, ei_tcvn
+TCVN5712-1, ei_tcvn
+TCVN5712-1:1993, ei_tcvn
+CHAR, ei_local_char
+WCHAR_T, ei_local_wchar_t
diff --git a/contrib/libs/libiconv/aliases_nocjk.h b/contrib/libs/libiconv/aliases_nocjk.h
index a4b7282c14..419f85b869 100644
--- a/contrib/libs/libiconv/aliases_nocjk.h
+++ b/contrib/libs/libiconv/aliases_nocjk.h
@@ -1,1272 +1,1272 @@
-/* ANSI-C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -m10 aliases_nocjk.gperf */
-/* Computed positions: -k'1-2,4-11,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('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 <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 1 "aliases_nocjk.gperf"
-struct alias { int name; unsigned int encoding_index; };
-
-#define TOTAL_KEYWORDS 253
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 19
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 622
-/* maximum key range = 617, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-aliases_hash (const char *str, unsigned int len)
-{
- static const unsigned short asso_values[] =
- {
- 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 0, 8, 623, 73, 2,
- 0, 87, 9, 12, 5, 82, 15, 19, 203, 623,
- 623, 623, 623, 623, 623, 1, 228, 0, 83, 1,
- 623, 9, 23, 0, 2, 52, 116, 12, 14, 43,
- 7, 623, 93, 0, 82, 141, 13, 68, 8, 22,
- 1, 623, 623, 623, 623, 1, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
- 623, 623, 623, 623, 623, 623, 623, 623
- };
- int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[10]];
- /*FALLTHROUGH*/
- case 10:
- hval += asso_values[(unsigned char)str[9]];
- /*FALLTHROUGH*/
- case 9:
- hval += asso_values[(unsigned char)str[8]];
- /*FALLTHROUGH*/
- case 8:
- hval += asso_values[(unsigned char)str[7]];
- /*FALLTHROUGH*/
- case 7:
- hval += asso_values[(unsigned char)str[6]];
- /*FALLTHROUGH*/
- case 6:
- hval += asso_values[(unsigned char)str[5]];
- /*FALLTHROUGH*/
- case 5:
- hval += asso_values[(unsigned char)str[4]];
- /*FALLTHROUGH*/
- case 4:
- hval += asso_values[(unsigned char)str[3]];
- /*FALLTHROUGH*/
- case 3:
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-struct stringpool_t
- {
- char stringpool_str6[sizeof("ASCII")];
- char stringpool_str7[sizeof("CSASCII")];
- char stringpool_str8[sizeof("CSVISCII")];
- char stringpool_str9[sizeof("JAVA")];
- char stringpool_str16[sizeof("MAC")];
- char stringpool_str17[sizeof("CP862")];
- char stringpool_str19[sizeof("VISCII")];
- char stringpool_str20[sizeof("MS-EE")];
- char stringpool_str23[sizeof("862")];
- char stringpool_str24[sizeof("CSUCS4")];
- char stringpool_str25[sizeof("CP1252")];
- char stringpool_str27[sizeof("CP866")];
- char stringpool_str28[sizeof("866")];
- char stringpool_str29[sizeof("CP1251")];
- char stringpool_str32[sizeof("ECMA-114")];
- char stringpool_str34[sizeof("MS-ANSI")];
- char stringpool_str35[sizeof("CP1256")];
- char stringpool_str40[sizeof("VISCII1.1-1")];
- char stringpool_str41[sizeof("C99")];
- char stringpool_str42[sizeof("CP154")];
- char stringpool_str43[sizeof("CP1254")];
- char stringpool_str44[sizeof("ECMA-118")];
- char stringpool_str49[sizeof("CP1255")];
- char stringpool_str52[sizeof("CP819")];
- char stringpool_str55[sizeof("CP1258")];
- char stringpool_str70[sizeof("ISO8859-2")];
- char stringpool_str71[sizeof("ISO-8859-2")];
- char stringpool_str72[sizeof("ISO_8859-2")];
- char stringpool_str74[sizeof("ISO8859-1")];
- char stringpool_str75[sizeof("ISO-8859-1")];
- char stringpool_str76[sizeof("ISO_8859-1")];
- char stringpool_str77[sizeof("ISO8859-11")];
- char stringpool_str78[sizeof("ISO-8859-11")];
- char stringpool_str79[sizeof("ISO_8859-11")];
- char stringpool_str80[sizeof("ISO8859-6")];
- char stringpool_str81[sizeof("ISO-8859-6")];
- char stringpool_str82[sizeof("ISO_8859-6")];
- char stringpool_str83[sizeof("ISO8859-16")];
- char stringpool_str84[sizeof("ISO-8859-16")];
- char stringpool_str85[sizeof("ISO_8859-16")];
- char stringpool_str87[sizeof("ISO_8859-16:2001")];
- char stringpool_str88[sizeof("ISO8859-4")];
- char stringpool_str89[sizeof("ISO-8859-4")];
- char stringpool_str90[sizeof("ISO_8859-4")];
- char stringpool_str91[sizeof("ISO8859-14")];
- char stringpool_str92[sizeof("ISO-8859-14")];
- char stringpool_str93[sizeof("ISO_8859-14")];
- char stringpool_str94[sizeof("ISO8859-5")];
- char stringpool_str95[sizeof("ISO-8859-5")];
- char stringpool_str96[sizeof("ISO_8859-5")];
- char stringpool_str97[sizeof("ISO8859-15")];
- char stringpool_str98[sizeof("ISO-8859-15")];
- char stringpool_str99[sizeof("ISO_8859-15")];
- char stringpool_str100[sizeof("ISO8859-8")];
- char stringpool_str101[sizeof("ISO-8859-8")];
- char stringpool_str102[sizeof("ISO_8859-8")];
- char stringpool_str103[sizeof("850")];
- char stringpool_str104[sizeof("ISO_8859-14:1998")];
- char stringpool_str106[sizeof("CP1131")];
- char stringpool_str107[sizeof("ISO_8859-15:1998")];
- char stringpool_str108[sizeof("ISO8859-9")];
- char stringpool_str109[sizeof("ISO-8859-9")];
- char stringpool_str110[sizeof("ISO_8859-9")];
- char stringpool_str111[sizeof("ISO-IR-6")];
- char stringpool_str112[sizeof("CP874")];
- char stringpool_str113[sizeof("ISO-IR-226")];
- char stringpool_str114[sizeof("TCVN")];
- char stringpool_str115[sizeof("ISO-IR-126")];
- char stringpool_str118[sizeof("L2")];
- char stringpool_str120[sizeof("ISO-IR-166")];
- char stringpool_str122[sizeof("L1")];
- char stringpool_str123[sizeof("CSKZ1048")];
- char stringpool_str124[sizeof("PT154")];
- char stringpool_str125[sizeof("R8")];
- char stringpool_str126[sizeof("MACTHAI")];
- char stringpool_str128[sizeof("L6")];
- char stringpool_str130[sizeof("CSPTCP154")];
- char stringpool_str132[sizeof("ISO-IR-144")];
- char stringpool_str133[sizeof("ARMSCII-8")];
- char stringpool_str135[sizeof("PTCP154")];
- char stringpool_str136[sizeof("L4")];
- char stringpool_str137[sizeof("LATIN2")];
- char stringpool_str141[sizeof("LATIN1")];
- char stringpool_str142[sizeof("L5")];
- char stringpool_str143[sizeof("US")];
- char stringpool_str144[sizeof("ISO-IR-148")];
- char stringpool_str145[sizeof("GEORGIAN-PS")];
- char stringpool_str146[sizeof("UCS-2")];
- char stringpool_str147[sizeof("LATIN6")];
- char stringpool_str148[sizeof("L8")];
- char stringpool_str149[sizeof("ANSI_X3.4-1986")];
- char stringpool_str150[sizeof("US-ASCII")];
- char stringpool_str151[sizeof("CSUNICODE")];
- char stringpool_str152[sizeof("ISO_646.IRV:1991")];
- char stringpool_str153[sizeof("ISO_8859-10:1992")];
- char stringpool_str155[sizeof("LATIN4")];
- char stringpool_str158[sizeof("CSUNICODE11")];
- char stringpool_str159[sizeof("ANSI_X3.4-1968")];
- char stringpool_str161[sizeof("LATIN5")];
- char stringpool_str162[sizeof("ISO-IR-199")];
- char stringpool_str164[sizeof("UCS-4")];
- char stringpool_str166[sizeof("GEORGIAN-ACADEMY")];
- char stringpool_str167[sizeof("LATIN8")];
- char stringpool_str169[sizeof("ISO646-US")];
- char stringpool_str170[sizeof("CP850")];
- char stringpool_str171[sizeof("CP1250")];
- char stringpool_str174[sizeof("KZ-1048")];
- char stringpool_str176[sizeof("LATIN-9")];
- char stringpool_str181[sizeof("CP367")];
- char stringpool_str182[sizeof("ISO-IR-101")];
- char stringpool_str187[sizeof("ROMAN8")];
- char stringpool_str188[sizeof("MACROMANIA")];
- char stringpool_str189[sizeof("CP1257")];
- char stringpool_str191[sizeof("GREEK8")];
- char stringpool_str194[sizeof("L10")];
- char stringpool_str197[sizeof("CSMACINTOSH")];
- char stringpool_str198[sizeof("MACROMAN")];
- char stringpool_str199[sizeof("CP1253")];
- char stringpool_str201[sizeof("TCVN-5712")];
- char stringpool_str202[sizeof("NEXTSTEP")];
- char stringpool_str206[sizeof("TCVN5712-1")];
- char stringpool_str207[sizeof("MACINTOSH")];
- char stringpool_str209[sizeof("ISO-CELTIC")];
- char stringpool_str210[sizeof("CSHPROMAN8")];
- char stringpool_str212[sizeof("GREEK")];
- char stringpool_str213[sizeof("CHAR")];
- char stringpool_str214[sizeof("TIS620.2529-1")];
- char stringpool_str216[sizeof("ISO-IR-109")];
- char stringpool_str219[sizeof("ISO8859-10")];
- char stringpool_str220[sizeof("ISO-8859-10")];
- char stringpool_str221[sizeof("ISO_8859-10")];
- char stringpool_str222[sizeof("ISO-IR-138")];
- char stringpool_str225[sizeof("ISO-IR-179")];
- char stringpool_str228[sizeof("MS-GREEK")];
- char stringpool_str229[sizeof("MACGREEK")];
- char stringpool_str232[sizeof("HP-ROMAN8")];
- char stringpool_str234[sizeof("ISO8859-7")];
- char stringpool_str235[sizeof("ISO-8859-7")];
- char stringpool_str236[sizeof("ISO_8859-7")];
- char stringpool_str237[sizeof("ASMO-708")];
- char stringpool_str239[sizeof("TIS620")];
- char stringpool_str240[sizeof("TIS-620")];
- char stringpool_str241[sizeof("UTF-16")];
- char stringpool_str242[sizeof("CSUNICODE11UTF7")];
- char stringpool_str244[sizeof("ISO8859-3")];
- char stringpool_str245[sizeof("ISO-8859-3")];
- char stringpool_str246[sizeof("ISO_8859-3")];
- char stringpool_str247[sizeof("ISO8859-13")];
- char stringpool_str248[sizeof("ISO-8859-13")];
- char stringpool_str249[sizeof("ISO_8859-13")];
- char stringpool_str250[sizeof("ISO-10646-UCS-2")];
- char stringpool_str251[sizeof("CSKOI8R")];
- char stringpool_str253[sizeof("ISO-IR-110")];
- char stringpool_str254[sizeof("IBM862")];
- char stringpool_str257[sizeof("ELOT_928")];
- char stringpool_str258[sizeof("UTF-8")];
- char stringpool_str259[sizeof("ISO-10646-UCS-4")];
- char stringpool_str260[sizeof("HEBREW")];
- char stringpool_str262[sizeof("CYRILLIC")];
- char stringpool_str263[sizeof("RK1048")];
- char stringpool_str264[sizeof("IBM866")];
- char stringpool_str266[sizeof("UCS-2LE")];
- char stringpool_str267[sizeof("CSISOLATIN2")];
- char stringpool_str269[sizeof("ISO-IR-127")];
- char stringpool_str271[sizeof("CSISOLATIN1")];
- char stringpool_str272[sizeof("MACCROATIAN")];
- char stringpool_str273[sizeof("CSISOLATINARABIC")];
- char stringpool_str274[sizeof("CSISOLATINCYRILLIC")];
- char stringpool_str275[sizeof("UCS-4LE")];
- char stringpool_str276[sizeof("CP1133")];
- char stringpool_str277[sizeof("CSISOLATIN6")];
- char stringpool_str278[sizeof("CSIBM866")];
- char stringpool_str280[sizeof("KOI8-T")];
- char stringpool_str281[sizeof("ISO-IR-157")];
- char stringpool_str282[sizeof("L7")];
- char stringpool_str283[sizeof("CYRILLIC-ASIAN")];
- char stringpool_str285[sizeof("CSISOLATIN4")];
- char stringpool_str286[sizeof("LATIN10")];
- char stringpool_str288[sizeof("WINDOWS-1252")];
- char stringpool_str289[sizeof("IBM819")];
- char stringpool_str290[sizeof("WINDOWS-1251")];
- char stringpool_str291[sizeof("CSISOLATIN5")];
- char stringpool_str292[sizeof("L3")];
- char stringpool_str293[sizeof("WINDOWS-1256")];
- char stringpool_str297[sizeof("WINDOWS-1254")];
- char stringpool_str299[sizeof("UNICODE-1-1")];
- char stringpool_str300[sizeof("WINDOWS-1255")];
- char stringpool_str301[sizeof("LATIN7")];
- char stringpool_str302[sizeof("KOI8-R")];
- char stringpool_str303[sizeof("WINDOWS-1258")];
- char stringpool_str304[sizeof("ISO_8859-4:1988")];
- char stringpool_str305[sizeof("CSPC862LATINHEBREW")];
- char stringpool_str307[sizeof("ISO_8859-5:1988")];
- char stringpool_str310[sizeof("ISO_8859-8:1988")];
- char stringpool_str311[sizeof("LATIN3")];
- char stringpool_str314[sizeof("TIS620-0")];
- char stringpool_str316[sizeof("UTF-32")];
- char stringpool_str318[sizeof("ISO_8859-9:1989")];
- char stringpool_str319[sizeof("STRK1048-2002")];
- char stringpool_str320[sizeof("UCS-2-SWAPPED")];
- char stringpool_str321[sizeof("MACICELAND")];
- char stringpool_str324[sizeof("ISO-IR-100")];
- char stringpool_str326[sizeof("MACUKRAINE")];
- char stringpool_str327[sizeof("MULELAO-1")];
- char stringpool_str328[sizeof("ARABIC")];
- char stringpool_str329[sizeof("UCS-4-SWAPPED")];
- char stringpool_str332[sizeof("CSISOLATINGREEK")];
- char stringpool_str334[sizeof("WCHAR_T")];
- char stringpool_str338[sizeof("MACCENTRALEUROPE")];
- char stringpool_str345[sizeof("MACARABIC")];
- char stringpool_str350[sizeof("ISO-IR-203")];
- char stringpool_str356[sizeof("UTF-16LE")];
- char stringpool_str361[sizeof("WINDOWS-1250")];
- char stringpool_str362[sizeof("ISO_8859-2:1987")];
- char stringpool_str363[sizeof("CSISOLATINHEBREW")];
- char stringpool_str364[sizeof("ISO_8859-1:1987")];
- char stringpool_str366[sizeof("MS-CYRL")];
- char stringpool_str367[sizeof("ISO_8859-6:1987")];
- char stringpool_str369[sizeof("TIS620.2533-1")];
- char stringpool_str370[sizeof("WINDOWS-1257")];
- char stringpool_str371[sizeof("MACCYRILLIC")];
- char stringpool_str372[sizeof("MAC-CYRILLIC")];
- char stringpool_str375[sizeof("WINDOWS-1253")];
- char stringpool_str378[sizeof("UCS-2BE")];
- char stringpool_str382[sizeof("ISO_8859-3:1988")];
- char stringpool_str385[sizeof("UNICODE-1-1-UTF-7")];
- char stringpool_str387[sizeof("UCS-4BE")];
- char stringpool_str388[sizeof("WINDOWS-874")];
- char stringpool_str392[sizeof("UTF-7")];
- char stringpool_str398[sizeof("KOI8-U")];
- char stringpool_str407[sizeof("IBM850")];
- char stringpool_str436[sizeof("UTF-32LE")];
- char stringpool_str437[sizeof("MACTURKISH")];
- char stringpool_str439[sizeof("MS-TURK")];
- char stringpool_str440[sizeof("TIS620.2533-0")];
- char stringpool_str441[sizeof("CSISOLATIN3")];
- char stringpool_str444[sizeof("ISO_8859-7:1987")];
- char stringpool_str449[sizeof("ISO_8859-7:2003")];
- char stringpool_str457[sizeof("MS-HEBR")];
- char stringpool_str461[sizeof("UCS-2-INTERNAL")];
- char stringpool_str468[sizeof("UTF-16BE")];
- char stringpool_str470[sizeof("UCS-4-INTERNAL")];
- char stringpool_str490[sizeof("IBM367")];
- char stringpool_str492[sizeof("KOI8-RU")];
- char stringpool_str499[sizeof("TCVN5712-1:1993")];
- char stringpool_str504[sizeof("MACHEBREW")];
- char stringpool_str510[sizeof("IBM-CP1133")];
- char stringpool_str538[sizeof("UNICODEBIG")];
- char stringpool_str548[sizeof("UTF-32BE")];
- char stringpool_str570[sizeof("MS-ARAB")];
- char stringpool_str576[sizeof("UNICODELITTLE")];
- char stringpool_str586[sizeof("CSPC850MULTILINGUAL")];
- char stringpool_str622[sizeof("WINBALTRIM")];
- };
-static const struct stringpool_t stringpool_contents =
- {
- "ASCII",
- "CSASCII",
- "CSVISCII",
- "JAVA",
- "MAC",
- "CP862",
- "VISCII",
- "MS-EE",
- "862",
- "CSUCS4",
- "CP1252",
- "CP866",
- "866",
- "CP1251",
- "ECMA-114",
- "MS-ANSI",
- "CP1256",
- "VISCII1.1-1",
- "C99",
- "CP154",
- "CP1254",
- "ECMA-118",
- "CP1255",
- "CP819",
- "CP1258",
- "ISO8859-2",
- "ISO-8859-2",
- "ISO_8859-2",
- "ISO8859-1",
- "ISO-8859-1",
- "ISO_8859-1",
- "ISO8859-11",
- "ISO-8859-11",
- "ISO_8859-11",
- "ISO8859-6",
- "ISO-8859-6",
- "ISO_8859-6",
- "ISO8859-16",
- "ISO-8859-16",
- "ISO_8859-16",
- "ISO_8859-16:2001",
- "ISO8859-4",
- "ISO-8859-4",
- "ISO_8859-4",
- "ISO8859-14",
- "ISO-8859-14",
- "ISO_8859-14",
- "ISO8859-5",
- "ISO-8859-5",
- "ISO_8859-5",
- "ISO8859-15",
- "ISO-8859-15",
- "ISO_8859-15",
- "ISO8859-8",
- "ISO-8859-8",
- "ISO_8859-8",
- "850",
- "ISO_8859-14:1998",
- "CP1131",
- "ISO_8859-15:1998",
- "ISO8859-9",
- "ISO-8859-9",
- "ISO_8859-9",
- "ISO-IR-6",
- "CP874",
- "ISO-IR-226",
- "TCVN",
- "ISO-IR-126",
- "L2",
- "ISO-IR-166",
- "L1",
- "CSKZ1048",
- "PT154",
- "R8",
- "MACTHAI",
- "L6",
- "CSPTCP154",
- "ISO-IR-144",
- "ARMSCII-8",
- "PTCP154",
- "L4",
- "LATIN2",
- "LATIN1",
- "L5",
- "US",
- "ISO-IR-148",
- "GEORGIAN-PS",
- "UCS-2",
- "LATIN6",
- "L8",
- "ANSI_X3.4-1986",
- "US-ASCII",
- "CSUNICODE",
- "ISO_646.IRV:1991",
- "ISO_8859-10:1992",
- "LATIN4",
- "CSUNICODE11",
- "ANSI_X3.4-1968",
- "LATIN5",
- "ISO-IR-199",
- "UCS-4",
- "GEORGIAN-ACADEMY",
- "LATIN8",
- "ISO646-US",
- "CP850",
- "CP1250",
- "KZ-1048",
- "LATIN-9",
- "CP367",
- "ISO-IR-101",
- "ROMAN8",
- "MACROMANIA",
- "CP1257",
- "GREEK8",
- "L10",
- "CSMACINTOSH",
- "MACROMAN",
- "CP1253",
- "TCVN-5712",
- "NEXTSTEP",
- "TCVN5712-1",
- "MACINTOSH",
- "ISO-CELTIC",
- "CSHPROMAN8",
- "GREEK",
- "CHAR",
- "TIS620.2529-1",
- "ISO-IR-109",
- "ISO8859-10",
- "ISO-8859-10",
- "ISO_8859-10",
- "ISO-IR-138",
- "ISO-IR-179",
- "MS-GREEK",
- "MACGREEK",
- "HP-ROMAN8",
- "ISO8859-7",
- "ISO-8859-7",
- "ISO_8859-7",
- "ASMO-708",
- "TIS620",
- "TIS-620",
- "UTF-16",
- "CSUNICODE11UTF7",
- "ISO8859-3",
- "ISO-8859-3",
- "ISO_8859-3",
- "ISO8859-13",
- "ISO-8859-13",
- "ISO_8859-13",
- "ISO-10646-UCS-2",
- "CSKOI8R",
- "ISO-IR-110",
- "IBM862",
- "ELOT_928",
- "UTF-8",
- "ISO-10646-UCS-4",
- "HEBREW",
- "CYRILLIC",
- "RK1048",
- "IBM866",
- "UCS-2LE",
- "CSISOLATIN2",
- "ISO-IR-127",
- "CSISOLATIN1",
- "MACCROATIAN",
- "CSISOLATINARABIC",
- "CSISOLATINCYRILLIC",
- "UCS-4LE",
- "CP1133",
- "CSISOLATIN6",
- "CSIBM866",
- "KOI8-T",
- "ISO-IR-157",
- "L7",
- "CYRILLIC-ASIAN",
- "CSISOLATIN4",
- "LATIN10",
- "WINDOWS-1252",
- "IBM819",
- "WINDOWS-1251",
- "CSISOLATIN5",
- "L3",
- "WINDOWS-1256",
- "WINDOWS-1254",
- "UNICODE-1-1",
- "WINDOWS-1255",
- "LATIN7",
- "KOI8-R",
- "WINDOWS-1258",
- "ISO_8859-4:1988",
- "CSPC862LATINHEBREW",
- "ISO_8859-5:1988",
- "ISO_8859-8:1988",
- "LATIN3",
- "TIS620-0",
- "UTF-32",
- "ISO_8859-9:1989",
- "STRK1048-2002",
- "UCS-2-SWAPPED",
- "MACICELAND",
- "ISO-IR-100",
- "MACUKRAINE",
- "MULELAO-1",
- "ARABIC",
- "UCS-4-SWAPPED",
- "CSISOLATINGREEK",
- "WCHAR_T",
- "MACCENTRALEUROPE",
- "MACARABIC",
- "ISO-IR-203",
- "UTF-16LE",
- "WINDOWS-1250",
- "ISO_8859-2:1987",
- "CSISOLATINHEBREW",
- "ISO_8859-1:1987",
- "MS-CYRL",
- "ISO_8859-6:1987",
- "TIS620.2533-1",
- "WINDOWS-1257",
- "MACCYRILLIC",
- "MAC-CYRILLIC",
- "WINDOWS-1253",
- "UCS-2BE",
- "ISO_8859-3:1988",
- "UNICODE-1-1-UTF-7",
- "UCS-4BE",
- "WINDOWS-874",
- "UTF-7",
- "KOI8-U",
- "IBM850",
- "UTF-32LE",
- "MACTURKISH",
- "MS-TURK",
- "TIS620.2533-0",
- "CSISOLATIN3",
- "ISO_8859-7:1987",
- "ISO_8859-7:2003",
- "MS-HEBR",
- "UCS-2-INTERNAL",
- "UTF-16BE",
- "UCS-4-INTERNAL",
- "IBM367",
- "KOI8-RU",
- "TCVN5712-1:1993",
- "MACHEBREW",
- "IBM-CP1133",
- "UNICODEBIG",
- "UTF-32BE",
- "MS-ARAB",
- "UNICODELITTLE",
- "CSPC850MULTILINGUAL",
- "WINBALTRIM"
- };
-#define stringpool ((const char *) &stringpool_contents)
-
-static const struct alias aliases[] =
- {
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 13 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, ei_ascii},
-#line 22 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, ei_ascii},
-#line 258 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, ei_viscii},
-#line 52 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, ei_java},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 212 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_mac_roman},
-#line 201 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_cp862},
- {-1},
-#line 256 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_viscii},
-#line 173 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_cp1250},
- {-1}, {-1},
-#line 203 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_cp862},
-#line 35 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ucs4},
-#line 177 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_cp1252},
- {-1},
-#line 205 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_cp866},
-#line 207 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_cp866},
-#line 174 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_cp1251},
- {-1}, {-1},
-#line 98 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_iso8859_6},
- {-1},
-#line 179 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_cp1252},
-#line 189 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_cp1256},
- {-1}, {-1}, {-1}, {-1},
-#line 257 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_viscii},
-#line 51 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_c99},
-#line 237 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_pt154},
-#line 183 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_cp1254},
-#line 108 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_iso8859_7},
- {-1}, {-1}, {-1}, {-1},
-#line 186 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_cp1255},
- {-1}, {-1},
-#line 57 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_1},
- {-1}, {-1},
-#line 195 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_cp1258},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
-#line 70 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_iso8859_2},
-#line 63 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_2},
-#line 64 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_iso8859_2},
- {-1},
-#line 62 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_1},
-#line 53 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_1},
-#line 54 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso8859_1},
-#line 139 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_11},
-#line 137 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_iso8859_11},
-#line 138 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_11},
-#line 102 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_6},
-#line 94 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_iso8859_6},
-#line 95 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_6},
-#line 166 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str83, ei_iso8859_16},
-#line 160 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_iso8859_16},
-#line 161 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str85, ei_iso8859_16},
- {-1},
-#line 162 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_16},
-#line 86 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_iso8859_4},
-#line 79 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_4},
-#line 80 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str90, ei_iso8859_4},
-#line 153 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_14},
-#line 146 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_14},
-#line 147 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_14},
-#line 93 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str94, ei_iso8859_5},
-#line 87 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5},
-#line 88 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_5},
-#line 159 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_15},
-#line 154 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_15},
-#line 155 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str99, ei_iso8859_15},
-#line 120 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_iso8859_8},
-#line 114 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str101, ei_iso8859_8},
-#line 115 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_iso8859_8},
-#line 199 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_cp850},
-#line 148 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_iso8859_14},
- {-1},
-#line 209 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_cp1131},
-#line 156 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_15},
-#line 128 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_9},
-#line 121 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_9},
-#line 122 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_9},
-#line 16 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_ascii},
-#line 254 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_cp874},
-#line 163 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_16},
-#line 259 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_tcvn},
-#line 107 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_iso8859_7},
- {-1}, {-1},
-#line 68 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_2},
- {-1},
-#line 253 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_tis620},
- {-1},
-#line 60 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str122, ei_iso8859_1},
-#line 243 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_rk1048},
-#line 235 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_pt154},
-#line 228 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_hp_roman8},
-#line 225 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_mac_thai},
- {-1},
-#line 134 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_10},
- {-1},
-#line 239 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_pt154},
- {-1},
-#line 90 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_5},
-#line 231 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str133, ei_armscii_8},
- {-1},
-#line 236 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_pt154},
-#line 84 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_4},
-#line 67 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_2},
- {-1}, {-1}, {-1},
-#line 59 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str141, ei_iso8859_1},
-#line 126 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_9},
-#line 21 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_ascii},
-#line 124 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_9},
-#line 233 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_georgian_ps},
-#line 24 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_ucs2},
-#line 133 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_iso8859_10},
-#line 151 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_14},
-#line 18 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_ascii},
-#line 12 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_ascii},
-#line 26 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_ucs2},
-#line 15 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_ascii},
-#line 131 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_10},
- {-1},
-#line 83 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_4},
- {-1}, {-1},
-#line 30 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_ucs2be},
-#line 17 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_ascii},
- {-1},
-#line 125 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_9},
-#line 149 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_14},
- {-1},
-#line 33 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_ucs4},
- {-1},
-#line 232 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_georgian_academy},
-#line 150 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_14},
- {-1},
-#line 14 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_ascii},
-#line 197 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_cp850},
-#line 171 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_cp1250},
- {-1}, {-1},
-#line 242 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_rk1048},
- {-1},
-#line 158 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso8859_15},
- {-1}, {-1}, {-1}, {-1},
-#line 19 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_ascii},
-#line 66 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_iso8859_2},
- {-1}, {-1}, {-1}, {-1},
-#line 227 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str187, ei_hp_roman8},
-#line 217 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str188, ei_mac_romania},
-#line 192 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str189, ei_cp1257},
- {-1},
-#line 110 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str191, ei_iso8859_7},
- {-1}, {-1},
-#line 165 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_iso8859_16},
- {-1}, {-1},
-#line 213 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_mac_roman},
-#line 210 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_mac_roman},
-#line 180 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_cp1253},
- {-1},
-#line 260 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str201, ei_tcvn},
-#line 230 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_nextstep},
- {-1}, {-1}, {-1},
-#line 261 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_tcvn},
-#line 211 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_mac_roman},
- {-1},
-#line 152 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_iso8859_14},
-#line 229 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_hp_roman8},
- {-1},
-#line 111 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_iso8859_7},
-#line 263 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str213, ei_local_char},
-#line 250 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_tis620},
- {-1},
-#line 74 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str216, ei_iso8859_3},
- {-1}, {-1},
-#line 136 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str219, ei_iso8859_10},
-#line 129 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str220, ei_iso8859_10},
-#line 130 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str221, ei_iso8859_10},
-#line 117 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_iso8859_8},
- {-1}, {-1},
-#line 142 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_13},
- {-1}, {-1},
-#line 182 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_cp1253},
-#line 221 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str229, ei_mac_greek},
- {-1}, {-1},
-#line 226 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_hp_roman8},
- {-1},
-#line 113 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_7},
-#line 103 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_7},
-#line 104 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_7},
-#line 99 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_6},
- {-1},
-#line 248 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str239, ei_tis620},
-#line 247 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_tis620},
-#line 38 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_utf16},
-#line 46 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_utf7},
- {-1},
-#line 78 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_iso8859_3},
-#line 71 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_iso8859_3},
-#line 72 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_iso8859_3},
-#line 145 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_13},
-#line 140 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_iso8859_13},
-#line 141 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_iso8859_13},
-#line 25 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_ucs2},
-#line 168 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_koi8_r},
- {-1},
-#line 82 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_iso8859_4},
-#line 202 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str254, ei_cp862},
- {-1}, {-1},
-#line 109 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_iso8859_7},
-#line 23 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_utf8},
-#line 34 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_ucs4},
-#line 118 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_iso8859_8},
- {-1},
-#line 91 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_5},
-#line 240 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_rk1048},
-#line 206 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_cp866},
- {-1},
-#line 31 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_ucs2le},
-#line 69 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_iso8859_2},
- {-1},
-#line 97 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str269, ei_iso8859_6},
- {-1},
-#line 61 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_1},
-#line 216 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str272, ei_mac_croatian},
-#line 101 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_iso8859_6},
-#line 92 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_iso8859_5},
-#line 37 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_ucs4le},
-#line 245 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_cp1133},
-#line 135 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_iso8859_10},
-#line 208 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_cp866},
- {-1},
-#line 234 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_koi8_t},
-#line 132 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso8859_10},
-#line 144 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_iso8859_13},
-#line 238 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_pt154},
- {-1},
-#line 85 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str285, ei_iso8859_4},
-#line 164 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_iso8859_16},
- {-1},
-#line 178 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_cp1252},
-#line 58 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str289, ei_iso8859_1},
-#line 175 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_cp1251},
-#line 127 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_iso8859_9},
-#line 76 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_iso8859_3},
-#line 190 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str293, ei_cp1256},
- {-1}, {-1}, {-1},
-#line 184 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_cp1254},
- {-1},
-#line 29 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str299, ei_ucs2be},
-#line 187 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_cp1255},
-#line 143 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_iso8859_13},
-#line 167 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_koi8_r},
-#line 196 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_cp1258},
-#line 81 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_iso8859_4},
-#line 204 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_cp862},
- {-1},
-#line 89 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_iso8859_5},
- {-1}, {-1},
-#line 116 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_8},
-#line 75 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str311, ei_iso8859_3},
- {-1}, {-1},
-#line 249 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str314, ei_tis620},
- {-1},
-#line 41 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_utf32},
- {-1},
-#line 123 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_9},
-#line 241 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_rk1048},
-#line 48 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2swapped},
-#line 215 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_mac_iceland},
- {-1}, {-1},
-#line 56 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_1},
- {-1},
-#line 220 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_mac_ukraine},
-#line 244 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_mulelao},
-#line 100 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str328, ei_iso8859_6},
-#line 50 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_ucs4swapped},
- {-1}, {-1},
-#line 112 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_7},
- {-1},
-#line 264 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str334, ei_local_wchar_t},
- {-1}, {-1}, {-1},
-#line 214 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str338, ei_mac_centraleurope},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 224 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_mac_arabic},
- {-1}, {-1}, {-1}, {-1},
-#line 157 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str350, ei_iso8859_15},
- {-1}, {-1}, {-1}, {-1}, {-1},
-#line 40 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_utf16le},
- {-1}, {-1}, {-1}, {-1},
-#line 172 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_cp1250},
-#line 65 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_2},
-#line 119 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_iso8859_8},
-#line 55 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str364, ei_iso8859_1},
- {-1},
-#line 176 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_cp1251},
-#line 96 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str367, ei_iso8859_6},
- {-1},
-#line 252 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_tis620},
-#line 193 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_cp1257},
-#line 218 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str371, ei_mac_cyrillic},
-#line 219 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_mac_cyrillic},
- {-1}, {-1},
-#line 181 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_cp1253},
- {-1}, {-1},
-#line 27 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str378, ei_ucs2be},
- {-1}, {-1}, {-1},
-#line 73 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str382, ei_iso8859_3},
- {-1}, {-1},
-#line 45 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str385, ei_utf7},
- {-1},
-#line 36 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_ucs4be},
-#line 255 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_cp874},
- {-1}, {-1}, {-1},
-#line 44 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_utf7},
- {-1}, {-1}, {-1}, {-1}, {-1},
-#line 169 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str398, ei_koi8_u},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 198 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_cp850},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1},
-#line 43 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str436, ei_utf32le},
-#line 222 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_mac_turkish},
- {-1},
-#line 185 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str439, ei_cp1254},
-#line 251 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_tis620},
-#line 77 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str441, ei_iso8859_3},
- {-1}, {-1},
-#line 105 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_7},
- {-1}, {-1}, {-1}, {-1},
-#line 106 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_iso8859_7},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 188 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_cp1255},
- {-1}, {-1}, {-1},
-#line 47 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str461, ei_ucs2internal},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 39 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_utf16be},
- {-1},
-#line 49 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_ucs4internal},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1},
-#line 20 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str490, ei_ascii},
- {-1},
-#line 170 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_koi8_ru},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 262 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str499, ei_tcvn},
- {-1}, {-1}, {-1}, {-1},
-#line 223 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_mac_hebrew},
- {-1}, {-1}, {-1}, {-1}, {-1},
-#line 246 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_cp1133},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 28 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str538, ei_ucs2be},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 42 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_utf32be},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
-#line 191 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_cp1256},
- {-1}, {-1}, {-1}, {-1}, {-1},
-#line 32 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str576, ei_ucs2le},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 200 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_cp850},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 194 "aliases_nocjk.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str622, ei_cp1257}
- };
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct alias *
-aliases_lookup (const char *str, unsigned int len)
-{
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- int key = aliases_hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- int o = aliases[key].name;
- if (o >= 0)
- {
- const char *s = o + stringpool;
-
- if (*str == *s && !strcmp (str + 1, s + 1))
- return &aliases[key];
- }
- }
- }
- return 0;
-}
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -m10 aliases_nocjk.gperf */
+/* Computed positions: -k'1-2,4-11,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('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 <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "aliases_nocjk.gperf"
+struct alias { int name; unsigned int encoding_index; };
+
+#define TOTAL_KEYWORDS 253
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 19
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 622
+/* maximum key range = 617, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+aliases_hash (const char *str, unsigned int len)
+{
+ static const unsigned short asso_values[] =
+ {
+ 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 0, 8, 623, 73, 2,
+ 0, 87, 9, 12, 5, 82, 15, 19, 203, 623,
+ 623, 623, 623, 623, 623, 1, 228, 0, 83, 1,
+ 623, 9, 23, 0, 2, 52, 116, 12, 14, 43,
+ 7, 623, 93, 0, 82, 141, 13, 68, 8, 22,
+ 1, 623, 623, 623, 623, 1, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
+ 623, 623, 623, 623, 623, 623, 623, 623
+ };
+ int hval = len;
+
+ switch (hval)
+ {
+ default:
+ hval += asso_values[(unsigned char)str[10]];
+ /*FALLTHROUGH*/
+ case 10:
+ hval += asso_values[(unsigned char)str[9]];
+ /*FALLTHROUGH*/
+ case 9:
+ hval += asso_values[(unsigned char)str[8]];
+ /*FALLTHROUGH*/
+ case 8:
+ hval += asso_values[(unsigned char)str[7]];
+ /*FALLTHROUGH*/
+ case 7:
+ hval += asso_values[(unsigned char)str[6]];
+ /*FALLTHROUGH*/
+ case 6:
+ hval += asso_values[(unsigned char)str[5]];
+ /*FALLTHROUGH*/
+ case 5:
+ hval += asso_values[(unsigned char)str[4]];
+ /*FALLTHROUGH*/
+ case 4:
+ hval += asso_values[(unsigned char)str[3]];
+ /*FALLTHROUGH*/
+ case 3:
+ case 2:
+ hval += asso_values[(unsigned char)str[1]];
+ /*FALLTHROUGH*/
+ case 1:
+ hval += asso_values[(unsigned char)str[0]];
+ break;
+ }
+ return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+struct stringpool_t
+ {
+ char stringpool_str6[sizeof("ASCII")];
+ char stringpool_str7[sizeof("CSASCII")];
+ char stringpool_str8[sizeof("CSVISCII")];
+ char stringpool_str9[sizeof("JAVA")];
+ char stringpool_str16[sizeof("MAC")];
+ char stringpool_str17[sizeof("CP862")];
+ char stringpool_str19[sizeof("VISCII")];
+ char stringpool_str20[sizeof("MS-EE")];
+ char stringpool_str23[sizeof("862")];
+ char stringpool_str24[sizeof("CSUCS4")];
+ char stringpool_str25[sizeof("CP1252")];
+ char stringpool_str27[sizeof("CP866")];
+ char stringpool_str28[sizeof("866")];
+ char stringpool_str29[sizeof("CP1251")];
+ char stringpool_str32[sizeof("ECMA-114")];
+ char stringpool_str34[sizeof("MS-ANSI")];
+ char stringpool_str35[sizeof("CP1256")];
+ char stringpool_str40[sizeof("VISCII1.1-1")];
+ char stringpool_str41[sizeof("C99")];
+ char stringpool_str42[sizeof("CP154")];
+ char stringpool_str43[sizeof("CP1254")];
+ char stringpool_str44[sizeof("ECMA-118")];
+ char stringpool_str49[sizeof("CP1255")];
+ char stringpool_str52[sizeof("CP819")];
+ char stringpool_str55[sizeof("CP1258")];
+ char stringpool_str70[sizeof("ISO8859-2")];
+ char stringpool_str71[sizeof("ISO-8859-2")];
+ char stringpool_str72[sizeof("ISO_8859-2")];
+ char stringpool_str74[sizeof("ISO8859-1")];
+ char stringpool_str75[sizeof("ISO-8859-1")];
+ char stringpool_str76[sizeof("ISO_8859-1")];
+ char stringpool_str77[sizeof("ISO8859-11")];
+ char stringpool_str78[sizeof("ISO-8859-11")];
+ char stringpool_str79[sizeof("ISO_8859-11")];
+ char stringpool_str80[sizeof("ISO8859-6")];
+ char stringpool_str81[sizeof("ISO-8859-6")];
+ char stringpool_str82[sizeof("ISO_8859-6")];
+ char stringpool_str83[sizeof("ISO8859-16")];
+ char stringpool_str84[sizeof("ISO-8859-16")];
+ char stringpool_str85[sizeof("ISO_8859-16")];
+ char stringpool_str87[sizeof("ISO_8859-16:2001")];
+ char stringpool_str88[sizeof("ISO8859-4")];
+ char stringpool_str89[sizeof("ISO-8859-4")];
+ char stringpool_str90[sizeof("ISO_8859-4")];
+ char stringpool_str91[sizeof("ISO8859-14")];
+ char stringpool_str92[sizeof("ISO-8859-14")];
+ char stringpool_str93[sizeof("ISO_8859-14")];
+ char stringpool_str94[sizeof("ISO8859-5")];
+ char stringpool_str95[sizeof("ISO-8859-5")];
+ char stringpool_str96[sizeof("ISO_8859-5")];
+ char stringpool_str97[sizeof("ISO8859-15")];
+ char stringpool_str98[sizeof("ISO-8859-15")];
+ char stringpool_str99[sizeof("ISO_8859-15")];
+ char stringpool_str100[sizeof("ISO8859-8")];
+ char stringpool_str101[sizeof("ISO-8859-8")];
+ char stringpool_str102[sizeof("ISO_8859-8")];
+ char stringpool_str103[sizeof("850")];
+ char stringpool_str104[sizeof("ISO_8859-14:1998")];
+ char stringpool_str106[sizeof("CP1131")];
+ char stringpool_str107[sizeof("ISO_8859-15:1998")];
+ char stringpool_str108[sizeof("ISO8859-9")];
+ char stringpool_str109[sizeof("ISO-8859-9")];
+ char stringpool_str110[sizeof("ISO_8859-9")];
+ char stringpool_str111[sizeof("ISO-IR-6")];
+ char stringpool_str112[sizeof("CP874")];
+ char stringpool_str113[sizeof("ISO-IR-226")];
+ char stringpool_str114[sizeof("TCVN")];
+ char stringpool_str115[sizeof("ISO-IR-126")];
+ char stringpool_str118[sizeof("L2")];
+ char stringpool_str120[sizeof("ISO-IR-166")];
+ char stringpool_str122[sizeof("L1")];
+ char stringpool_str123[sizeof("CSKZ1048")];
+ char stringpool_str124[sizeof("PT154")];
+ char stringpool_str125[sizeof("R8")];
+ char stringpool_str126[sizeof("MACTHAI")];
+ char stringpool_str128[sizeof("L6")];
+ char stringpool_str130[sizeof("CSPTCP154")];
+ char stringpool_str132[sizeof("ISO-IR-144")];
+ char stringpool_str133[sizeof("ARMSCII-8")];
+ char stringpool_str135[sizeof("PTCP154")];
+ char stringpool_str136[sizeof("L4")];
+ char stringpool_str137[sizeof("LATIN2")];
+ char stringpool_str141[sizeof("LATIN1")];
+ char stringpool_str142[sizeof("L5")];
+ char stringpool_str143[sizeof("US")];
+ char stringpool_str144[sizeof("ISO-IR-148")];
+ char stringpool_str145[sizeof("GEORGIAN-PS")];
+ char stringpool_str146[sizeof("UCS-2")];
+ char stringpool_str147[sizeof("LATIN6")];
+ char stringpool_str148[sizeof("L8")];
+ char stringpool_str149[sizeof("ANSI_X3.4-1986")];
+ char stringpool_str150[sizeof("US-ASCII")];
+ char stringpool_str151[sizeof("CSUNICODE")];
+ char stringpool_str152[sizeof("ISO_646.IRV:1991")];
+ char stringpool_str153[sizeof("ISO_8859-10:1992")];
+ char stringpool_str155[sizeof("LATIN4")];
+ char stringpool_str158[sizeof("CSUNICODE11")];
+ char stringpool_str159[sizeof("ANSI_X3.4-1968")];
+ char stringpool_str161[sizeof("LATIN5")];
+ char stringpool_str162[sizeof("ISO-IR-199")];
+ char stringpool_str164[sizeof("UCS-4")];
+ char stringpool_str166[sizeof("GEORGIAN-ACADEMY")];
+ char stringpool_str167[sizeof("LATIN8")];
+ char stringpool_str169[sizeof("ISO646-US")];
+ char stringpool_str170[sizeof("CP850")];
+ char stringpool_str171[sizeof("CP1250")];
+ char stringpool_str174[sizeof("KZ-1048")];
+ char stringpool_str176[sizeof("LATIN-9")];
+ char stringpool_str181[sizeof("CP367")];
+ char stringpool_str182[sizeof("ISO-IR-101")];
+ char stringpool_str187[sizeof("ROMAN8")];
+ char stringpool_str188[sizeof("MACROMANIA")];
+ char stringpool_str189[sizeof("CP1257")];
+ char stringpool_str191[sizeof("GREEK8")];
+ char stringpool_str194[sizeof("L10")];
+ char stringpool_str197[sizeof("CSMACINTOSH")];
+ char stringpool_str198[sizeof("MACROMAN")];
+ char stringpool_str199[sizeof("CP1253")];
+ char stringpool_str201[sizeof("TCVN-5712")];
+ char stringpool_str202[sizeof("NEXTSTEP")];
+ char stringpool_str206[sizeof("TCVN5712-1")];
+ char stringpool_str207[sizeof("MACINTOSH")];
+ char stringpool_str209[sizeof("ISO-CELTIC")];
+ char stringpool_str210[sizeof("CSHPROMAN8")];
+ char stringpool_str212[sizeof("GREEK")];
+ char stringpool_str213[sizeof("CHAR")];
+ char stringpool_str214[sizeof("TIS620.2529-1")];
+ char stringpool_str216[sizeof("ISO-IR-109")];
+ char stringpool_str219[sizeof("ISO8859-10")];
+ char stringpool_str220[sizeof("ISO-8859-10")];
+ char stringpool_str221[sizeof("ISO_8859-10")];
+ char stringpool_str222[sizeof("ISO-IR-138")];
+ char stringpool_str225[sizeof("ISO-IR-179")];
+ char stringpool_str228[sizeof("MS-GREEK")];
+ char stringpool_str229[sizeof("MACGREEK")];
+ char stringpool_str232[sizeof("HP-ROMAN8")];
+ char stringpool_str234[sizeof("ISO8859-7")];
+ char stringpool_str235[sizeof("ISO-8859-7")];
+ char stringpool_str236[sizeof("ISO_8859-7")];
+ char stringpool_str237[sizeof("ASMO-708")];
+ char stringpool_str239[sizeof("TIS620")];
+ char stringpool_str240[sizeof("TIS-620")];
+ char stringpool_str241[sizeof("UTF-16")];
+ char stringpool_str242[sizeof("CSUNICODE11UTF7")];
+ char stringpool_str244[sizeof("ISO8859-3")];
+ char stringpool_str245[sizeof("ISO-8859-3")];
+ char stringpool_str246[sizeof("ISO_8859-3")];
+ char stringpool_str247[sizeof("ISO8859-13")];
+ char stringpool_str248[sizeof("ISO-8859-13")];
+ char stringpool_str249[sizeof("ISO_8859-13")];
+ char stringpool_str250[sizeof("ISO-10646-UCS-2")];
+ char stringpool_str251[sizeof("CSKOI8R")];
+ char stringpool_str253[sizeof("ISO-IR-110")];
+ char stringpool_str254[sizeof("IBM862")];
+ char stringpool_str257[sizeof("ELOT_928")];
+ char stringpool_str258[sizeof("UTF-8")];
+ char stringpool_str259[sizeof("ISO-10646-UCS-4")];
+ char stringpool_str260[sizeof("HEBREW")];
+ char stringpool_str262[sizeof("CYRILLIC")];
+ char stringpool_str263[sizeof("RK1048")];
+ char stringpool_str264[sizeof("IBM866")];
+ char stringpool_str266[sizeof("UCS-2LE")];
+ char stringpool_str267[sizeof("CSISOLATIN2")];
+ char stringpool_str269[sizeof("ISO-IR-127")];
+ char stringpool_str271[sizeof("CSISOLATIN1")];
+ char stringpool_str272[sizeof("MACCROATIAN")];
+ char stringpool_str273[sizeof("CSISOLATINARABIC")];
+ char stringpool_str274[sizeof("CSISOLATINCYRILLIC")];
+ char stringpool_str275[sizeof("UCS-4LE")];
+ char stringpool_str276[sizeof("CP1133")];
+ char stringpool_str277[sizeof("CSISOLATIN6")];
+ char stringpool_str278[sizeof("CSIBM866")];
+ char stringpool_str280[sizeof("KOI8-T")];
+ char stringpool_str281[sizeof("ISO-IR-157")];
+ char stringpool_str282[sizeof("L7")];
+ char stringpool_str283[sizeof("CYRILLIC-ASIAN")];
+ char stringpool_str285[sizeof("CSISOLATIN4")];
+ char stringpool_str286[sizeof("LATIN10")];
+ char stringpool_str288[sizeof("WINDOWS-1252")];
+ char stringpool_str289[sizeof("IBM819")];
+ char stringpool_str290[sizeof("WINDOWS-1251")];
+ char stringpool_str291[sizeof("CSISOLATIN5")];
+ char stringpool_str292[sizeof("L3")];
+ char stringpool_str293[sizeof("WINDOWS-1256")];
+ char stringpool_str297[sizeof("WINDOWS-1254")];
+ char stringpool_str299[sizeof("UNICODE-1-1")];
+ char stringpool_str300[sizeof("WINDOWS-1255")];
+ char stringpool_str301[sizeof("LATIN7")];
+ char stringpool_str302[sizeof("KOI8-R")];
+ char stringpool_str303[sizeof("WINDOWS-1258")];
+ char stringpool_str304[sizeof("ISO_8859-4:1988")];
+ char stringpool_str305[sizeof("CSPC862LATINHEBREW")];
+ char stringpool_str307[sizeof("ISO_8859-5:1988")];
+ char stringpool_str310[sizeof("ISO_8859-8:1988")];
+ char stringpool_str311[sizeof("LATIN3")];
+ char stringpool_str314[sizeof("TIS620-0")];
+ char stringpool_str316[sizeof("UTF-32")];
+ char stringpool_str318[sizeof("ISO_8859-9:1989")];
+ char stringpool_str319[sizeof("STRK1048-2002")];
+ char stringpool_str320[sizeof("UCS-2-SWAPPED")];
+ char stringpool_str321[sizeof("MACICELAND")];
+ char stringpool_str324[sizeof("ISO-IR-100")];
+ char stringpool_str326[sizeof("MACUKRAINE")];
+ char stringpool_str327[sizeof("MULELAO-1")];
+ char stringpool_str328[sizeof("ARABIC")];
+ char stringpool_str329[sizeof("UCS-4-SWAPPED")];
+ char stringpool_str332[sizeof("CSISOLATINGREEK")];
+ char stringpool_str334[sizeof("WCHAR_T")];
+ char stringpool_str338[sizeof("MACCENTRALEUROPE")];
+ char stringpool_str345[sizeof("MACARABIC")];
+ char stringpool_str350[sizeof("ISO-IR-203")];
+ char stringpool_str356[sizeof("UTF-16LE")];
+ char stringpool_str361[sizeof("WINDOWS-1250")];
+ char stringpool_str362[sizeof("ISO_8859-2:1987")];
+ char stringpool_str363[sizeof("CSISOLATINHEBREW")];
+ char stringpool_str364[sizeof("ISO_8859-1:1987")];
+ char stringpool_str366[sizeof("MS-CYRL")];
+ char stringpool_str367[sizeof("ISO_8859-6:1987")];
+ char stringpool_str369[sizeof("TIS620.2533-1")];
+ char stringpool_str370[sizeof("WINDOWS-1257")];
+ char stringpool_str371[sizeof("MACCYRILLIC")];
+ char stringpool_str372[sizeof("MAC-CYRILLIC")];
+ char stringpool_str375[sizeof("WINDOWS-1253")];
+ char stringpool_str378[sizeof("UCS-2BE")];
+ char stringpool_str382[sizeof("ISO_8859-3:1988")];
+ char stringpool_str385[sizeof("UNICODE-1-1-UTF-7")];
+ char stringpool_str387[sizeof("UCS-4BE")];
+ char stringpool_str388[sizeof("WINDOWS-874")];
+ char stringpool_str392[sizeof("UTF-7")];
+ char stringpool_str398[sizeof("KOI8-U")];
+ char stringpool_str407[sizeof("IBM850")];
+ char stringpool_str436[sizeof("UTF-32LE")];
+ char stringpool_str437[sizeof("MACTURKISH")];
+ char stringpool_str439[sizeof("MS-TURK")];
+ char stringpool_str440[sizeof("TIS620.2533-0")];
+ char stringpool_str441[sizeof("CSISOLATIN3")];
+ char stringpool_str444[sizeof("ISO_8859-7:1987")];
+ char stringpool_str449[sizeof("ISO_8859-7:2003")];
+ char stringpool_str457[sizeof("MS-HEBR")];
+ char stringpool_str461[sizeof("UCS-2-INTERNAL")];
+ char stringpool_str468[sizeof("UTF-16BE")];
+ char stringpool_str470[sizeof("UCS-4-INTERNAL")];
+ char stringpool_str490[sizeof("IBM367")];
+ char stringpool_str492[sizeof("KOI8-RU")];
+ char stringpool_str499[sizeof("TCVN5712-1:1993")];
+ char stringpool_str504[sizeof("MACHEBREW")];
+ char stringpool_str510[sizeof("IBM-CP1133")];
+ char stringpool_str538[sizeof("UNICODEBIG")];
+ char stringpool_str548[sizeof("UTF-32BE")];
+ char stringpool_str570[sizeof("MS-ARAB")];
+ char stringpool_str576[sizeof("UNICODELITTLE")];
+ char stringpool_str586[sizeof("CSPC850MULTILINGUAL")];
+ char stringpool_str622[sizeof("WINBALTRIM")];
+ };
+static const struct stringpool_t stringpool_contents =
+ {
+ "ASCII",
+ "CSASCII",
+ "CSVISCII",
+ "JAVA",
+ "MAC",
+ "CP862",
+ "VISCII",
+ "MS-EE",
+ "862",
+ "CSUCS4",
+ "CP1252",
+ "CP866",
+ "866",
+ "CP1251",
+ "ECMA-114",
+ "MS-ANSI",
+ "CP1256",
+ "VISCII1.1-1",
+ "C99",
+ "CP154",
+ "CP1254",
+ "ECMA-118",
+ "CP1255",
+ "CP819",
+ "CP1258",
+ "ISO8859-2",
+ "ISO-8859-2",
+ "ISO_8859-2",
+ "ISO8859-1",
+ "ISO-8859-1",
+ "ISO_8859-1",
+ "ISO8859-11",
+ "ISO-8859-11",
+ "ISO_8859-11",
+ "ISO8859-6",
+ "ISO-8859-6",
+ "ISO_8859-6",
+ "ISO8859-16",
+ "ISO-8859-16",
+ "ISO_8859-16",
+ "ISO_8859-16:2001",
+ "ISO8859-4",
+ "ISO-8859-4",
+ "ISO_8859-4",
+ "ISO8859-14",
+ "ISO-8859-14",
+ "ISO_8859-14",
+ "ISO8859-5",
+ "ISO-8859-5",
+ "ISO_8859-5",
+ "ISO8859-15",
+ "ISO-8859-15",
+ "ISO_8859-15",
+ "ISO8859-8",
+ "ISO-8859-8",
+ "ISO_8859-8",
+ "850",
+ "ISO_8859-14:1998",
+ "CP1131",
+ "ISO_8859-15:1998",
+ "ISO8859-9",
+ "ISO-8859-9",
+ "ISO_8859-9",
+ "ISO-IR-6",
+ "CP874",
+ "ISO-IR-226",
+ "TCVN",
+ "ISO-IR-126",
+ "L2",
+ "ISO-IR-166",
+ "L1",
+ "CSKZ1048",
+ "PT154",
+ "R8",
+ "MACTHAI",
+ "L6",
+ "CSPTCP154",
+ "ISO-IR-144",
+ "ARMSCII-8",
+ "PTCP154",
+ "L4",
+ "LATIN2",
+ "LATIN1",
+ "L5",
+ "US",
+ "ISO-IR-148",
+ "GEORGIAN-PS",
+ "UCS-2",
+ "LATIN6",
+ "L8",
+ "ANSI_X3.4-1986",
+ "US-ASCII",
+ "CSUNICODE",
+ "ISO_646.IRV:1991",
+ "ISO_8859-10:1992",
+ "LATIN4",
+ "CSUNICODE11",
+ "ANSI_X3.4-1968",
+ "LATIN5",
+ "ISO-IR-199",
+ "UCS-4",
+ "GEORGIAN-ACADEMY",
+ "LATIN8",
+ "ISO646-US",
+ "CP850",
+ "CP1250",
+ "KZ-1048",
+ "LATIN-9",
+ "CP367",
+ "ISO-IR-101",
+ "ROMAN8",
+ "MACROMANIA",
+ "CP1257",
+ "GREEK8",
+ "L10",
+ "CSMACINTOSH",
+ "MACROMAN",
+ "CP1253",
+ "TCVN-5712",
+ "NEXTSTEP",
+ "TCVN5712-1",
+ "MACINTOSH",
+ "ISO-CELTIC",
+ "CSHPROMAN8",
+ "GREEK",
+ "CHAR",
+ "TIS620.2529-1",
+ "ISO-IR-109",
+ "ISO8859-10",
+ "ISO-8859-10",
+ "ISO_8859-10",
+ "ISO-IR-138",
+ "ISO-IR-179",
+ "MS-GREEK",
+ "MACGREEK",
+ "HP-ROMAN8",
+ "ISO8859-7",
+ "ISO-8859-7",
+ "ISO_8859-7",
+ "ASMO-708",
+ "TIS620",
+ "TIS-620",
+ "UTF-16",
+ "CSUNICODE11UTF7",
+ "ISO8859-3",
+ "ISO-8859-3",
+ "ISO_8859-3",
+ "ISO8859-13",
+ "ISO-8859-13",
+ "ISO_8859-13",
+ "ISO-10646-UCS-2",
+ "CSKOI8R",
+ "ISO-IR-110",
+ "IBM862",
+ "ELOT_928",
+ "UTF-8",
+ "ISO-10646-UCS-4",
+ "HEBREW",
+ "CYRILLIC",
+ "RK1048",
+ "IBM866",
+ "UCS-2LE",
+ "CSISOLATIN2",
+ "ISO-IR-127",
+ "CSISOLATIN1",
+ "MACCROATIAN",
+ "CSISOLATINARABIC",
+ "CSISOLATINCYRILLIC",
+ "UCS-4LE",
+ "CP1133",
+ "CSISOLATIN6",
+ "CSIBM866",
+ "KOI8-T",
+ "ISO-IR-157",
+ "L7",
+ "CYRILLIC-ASIAN",
+ "CSISOLATIN4",
+ "LATIN10",
+ "WINDOWS-1252",
+ "IBM819",
+ "WINDOWS-1251",
+ "CSISOLATIN5",
+ "L3",
+ "WINDOWS-1256",
+ "WINDOWS-1254",
+ "UNICODE-1-1",
+ "WINDOWS-1255",
+ "LATIN7",
+ "KOI8-R",
+ "WINDOWS-1258",
+ "ISO_8859-4:1988",
+ "CSPC862LATINHEBREW",
+ "ISO_8859-5:1988",
+ "ISO_8859-8:1988",
+ "LATIN3",
+ "TIS620-0",
+ "UTF-32",
+ "ISO_8859-9:1989",
+ "STRK1048-2002",
+ "UCS-2-SWAPPED",
+ "MACICELAND",
+ "ISO-IR-100",
+ "MACUKRAINE",
+ "MULELAO-1",
+ "ARABIC",
+ "UCS-4-SWAPPED",
+ "CSISOLATINGREEK",
+ "WCHAR_T",
+ "MACCENTRALEUROPE",
+ "MACARABIC",
+ "ISO-IR-203",
+ "UTF-16LE",
+ "WINDOWS-1250",
+ "ISO_8859-2:1987",
+ "CSISOLATINHEBREW",
+ "ISO_8859-1:1987",
+ "MS-CYRL",
+ "ISO_8859-6:1987",
+ "TIS620.2533-1",
+ "WINDOWS-1257",
+ "MACCYRILLIC",
+ "MAC-CYRILLIC",
+ "WINDOWS-1253",
+ "UCS-2BE",
+ "ISO_8859-3:1988",
+ "UNICODE-1-1-UTF-7",
+ "UCS-4BE",
+ "WINDOWS-874",
+ "UTF-7",
+ "KOI8-U",
+ "IBM850",
+ "UTF-32LE",
+ "MACTURKISH",
+ "MS-TURK",
+ "TIS620.2533-0",
+ "CSISOLATIN3",
+ "ISO_8859-7:1987",
+ "ISO_8859-7:2003",
+ "MS-HEBR",
+ "UCS-2-INTERNAL",
+ "UTF-16BE",
+ "UCS-4-INTERNAL",
+ "IBM367",
+ "KOI8-RU",
+ "TCVN5712-1:1993",
+ "MACHEBREW",
+ "IBM-CP1133",
+ "UNICODEBIG",
+ "UTF-32BE",
+ "MS-ARAB",
+ "UNICODELITTLE",
+ "CSPC850MULTILINGUAL",
+ "WINBALTRIM"
+ };
+#define stringpool ((const char *) &stringpool_contents)
+
+static const struct alias aliases[] =
+ {
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 13 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, ei_ascii},
+#line 22 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, ei_ascii},
+#line 258 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, ei_viscii},
+#line 52 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, ei_java},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 212 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_mac_roman},
+#line 201 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_cp862},
+ {-1},
+#line 256 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_viscii},
+#line 173 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_cp1250},
+ {-1}, {-1},
+#line 203 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_cp862},
+#line 35 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ucs4},
+#line 177 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_cp1252},
+ {-1},
+#line 205 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_cp866},
+#line 207 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_cp866},
+#line 174 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_cp1251},
+ {-1}, {-1},
+#line 98 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_iso8859_6},
+ {-1},
+#line 179 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_cp1252},
+#line 189 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_cp1256},
+ {-1}, {-1}, {-1}, {-1},
+#line 257 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_viscii},
+#line 51 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_c99},
+#line 237 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_pt154},
+#line 183 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_cp1254},
+#line 108 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_iso8859_7},
+ {-1}, {-1}, {-1}, {-1},
+#line 186 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_cp1255},
+ {-1}, {-1},
+#line 57 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_1},
+ {-1}, {-1},
+#line 195 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_cp1258},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+#line 70 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_iso8859_2},
+#line 63 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_2},
+#line 64 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_iso8859_2},
+ {-1},
+#line 62 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_1},
+#line 53 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_1},
+#line 54 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso8859_1},
+#line 139 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_11},
+#line 137 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_iso8859_11},
+#line 138 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_11},
+#line 102 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_6},
+#line 94 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_iso8859_6},
+#line 95 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_6},
+#line 166 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str83, ei_iso8859_16},
+#line 160 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_iso8859_16},
+#line 161 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str85, ei_iso8859_16},
+ {-1},
+#line 162 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_16},
+#line 86 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_iso8859_4},
+#line 79 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_4},
+#line 80 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str90, ei_iso8859_4},
+#line 153 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_14},
+#line 146 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_14},
+#line 147 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_14},
+#line 93 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str94, ei_iso8859_5},
+#line 87 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5},
+#line 88 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_5},
+#line 159 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_15},
+#line 154 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_15},
+#line 155 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str99, ei_iso8859_15},
+#line 120 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_iso8859_8},
+#line 114 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str101, ei_iso8859_8},
+#line 115 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_iso8859_8},
+#line 199 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_cp850},
+#line 148 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_iso8859_14},
+ {-1},
+#line 209 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_cp1131},
+#line 156 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_15},
+#line 128 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_9},
+#line 121 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_9},
+#line 122 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_9},
+#line 16 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_ascii},
+#line 254 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_cp874},
+#line 163 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_16},
+#line 259 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_tcvn},
+#line 107 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_iso8859_7},
+ {-1}, {-1},
+#line 68 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_2},
+ {-1},
+#line 253 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_tis620},
+ {-1},
+#line 60 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str122, ei_iso8859_1},
+#line 243 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_rk1048},
+#line 235 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_pt154},
+#line 228 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_hp_roman8},
+#line 225 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_mac_thai},
+ {-1},
+#line 134 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_10},
+ {-1},
+#line 239 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_pt154},
+ {-1},
+#line 90 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_5},
+#line 231 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str133, ei_armscii_8},
+ {-1},
+#line 236 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_pt154},
+#line 84 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_4},
+#line 67 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_2},
+ {-1}, {-1}, {-1},
+#line 59 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str141, ei_iso8859_1},
+#line 126 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_9},
+#line 21 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_ascii},
+#line 124 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_9},
+#line 233 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_georgian_ps},
+#line 24 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_ucs2},
+#line 133 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_iso8859_10},
+#line 151 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_14},
+#line 18 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_ascii},
+#line 12 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_ascii},
+#line 26 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_ucs2},
+#line 15 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_ascii},
+#line 131 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_10},
+ {-1},
+#line 83 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_4},
+ {-1}, {-1},
+#line 30 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_ucs2be},
+#line 17 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_ascii},
+ {-1},
+#line 125 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_9},
+#line 149 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_14},
+ {-1},
+#line 33 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_ucs4},
+ {-1},
+#line 232 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_georgian_academy},
+#line 150 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_14},
+ {-1},
+#line 14 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_ascii},
+#line 197 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_cp850},
+#line 171 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_cp1250},
+ {-1}, {-1},
+#line 242 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_rk1048},
+ {-1},
+#line 158 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso8859_15},
+ {-1}, {-1}, {-1}, {-1},
+#line 19 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_ascii},
+#line 66 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_iso8859_2},
+ {-1}, {-1}, {-1}, {-1},
+#line 227 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str187, ei_hp_roman8},
+#line 217 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str188, ei_mac_romania},
+#line 192 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str189, ei_cp1257},
+ {-1},
+#line 110 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str191, ei_iso8859_7},
+ {-1}, {-1},
+#line 165 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_iso8859_16},
+ {-1}, {-1},
+#line 213 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_mac_roman},
+#line 210 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_mac_roman},
+#line 180 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_cp1253},
+ {-1},
+#line 260 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str201, ei_tcvn},
+#line 230 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_nextstep},
+ {-1}, {-1}, {-1},
+#line 261 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_tcvn},
+#line 211 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_mac_roman},
+ {-1},
+#line 152 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_iso8859_14},
+#line 229 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_hp_roman8},
+ {-1},
+#line 111 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_iso8859_7},
+#line 263 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str213, ei_local_char},
+#line 250 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_tis620},
+ {-1},
+#line 74 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str216, ei_iso8859_3},
+ {-1}, {-1},
+#line 136 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str219, ei_iso8859_10},
+#line 129 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str220, ei_iso8859_10},
+#line 130 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str221, ei_iso8859_10},
+#line 117 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_iso8859_8},
+ {-1}, {-1},
+#line 142 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_13},
+ {-1}, {-1},
+#line 182 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_cp1253},
+#line 221 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str229, ei_mac_greek},
+ {-1}, {-1},
+#line 226 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_hp_roman8},
+ {-1},
+#line 113 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_7},
+#line 103 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_7},
+#line 104 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_7},
+#line 99 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_6},
+ {-1},
+#line 248 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str239, ei_tis620},
+#line 247 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_tis620},
+#line 38 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_utf16},
+#line 46 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_utf7},
+ {-1},
+#line 78 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_iso8859_3},
+#line 71 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_iso8859_3},
+#line 72 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_iso8859_3},
+#line 145 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_13},
+#line 140 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_iso8859_13},
+#line 141 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_iso8859_13},
+#line 25 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_ucs2},
+#line 168 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_koi8_r},
+ {-1},
+#line 82 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_iso8859_4},
+#line 202 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str254, ei_cp862},
+ {-1}, {-1},
+#line 109 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_iso8859_7},
+#line 23 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_utf8},
+#line 34 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_ucs4},
+#line 118 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_iso8859_8},
+ {-1},
+#line 91 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_5},
+#line 240 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_rk1048},
+#line 206 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_cp866},
+ {-1},
+#line 31 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_ucs2le},
+#line 69 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_iso8859_2},
+ {-1},
+#line 97 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str269, ei_iso8859_6},
+ {-1},
+#line 61 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_1},
+#line 216 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str272, ei_mac_croatian},
+#line 101 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_iso8859_6},
+#line 92 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_iso8859_5},
+#line 37 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_ucs4le},
+#line 245 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_cp1133},
+#line 135 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_iso8859_10},
+#line 208 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_cp866},
+ {-1},
+#line 234 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_koi8_t},
+#line 132 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso8859_10},
+#line 144 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_iso8859_13},
+#line 238 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_pt154},
+ {-1},
+#line 85 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str285, ei_iso8859_4},
+#line 164 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_iso8859_16},
+ {-1},
+#line 178 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_cp1252},
+#line 58 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str289, ei_iso8859_1},
+#line 175 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_cp1251},
+#line 127 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_iso8859_9},
+#line 76 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_iso8859_3},
+#line 190 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str293, ei_cp1256},
+ {-1}, {-1}, {-1},
+#line 184 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_cp1254},
+ {-1},
+#line 29 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str299, ei_ucs2be},
+#line 187 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_cp1255},
+#line 143 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_iso8859_13},
+#line 167 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_koi8_r},
+#line 196 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_cp1258},
+#line 81 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_iso8859_4},
+#line 204 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_cp862},
+ {-1},
+#line 89 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_iso8859_5},
+ {-1}, {-1},
+#line 116 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_8},
+#line 75 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str311, ei_iso8859_3},
+ {-1}, {-1},
+#line 249 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str314, ei_tis620},
+ {-1},
+#line 41 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_utf32},
+ {-1},
+#line 123 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_9},
+#line 241 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_rk1048},
+#line 48 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2swapped},
+#line 215 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_mac_iceland},
+ {-1}, {-1},
+#line 56 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_1},
+ {-1},
+#line 220 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_mac_ukraine},
+#line 244 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_mulelao},
+#line 100 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str328, ei_iso8859_6},
+#line 50 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_ucs4swapped},
+ {-1}, {-1},
+#line 112 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_7},
+ {-1},
+#line 264 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str334, ei_local_wchar_t},
+ {-1}, {-1}, {-1},
+#line 214 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str338, ei_mac_centraleurope},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 224 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_mac_arabic},
+ {-1}, {-1}, {-1}, {-1},
+#line 157 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str350, ei_iso8859_15},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+#line 40 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_utf16le},
+ {-1}, {-1}, {-1}, {-1},
+#line 172 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_cp1250},
+#line 65 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_2},
+#line 119 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_iso8859_8},
+#line 55 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str364, ei_iso8859_1},
+ {-1},
+#line 176 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_cp1251},
+#line 96 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str367, ei_iso8859_6},
+ {-1},
+#line 252 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_tis620},
+#line 193 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_cp1257},
+#line 218 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str371, ei_mac_cyrillic},
+#line 219 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_mac_cyrillic},
+ {-1}, {-1},
+#line 181 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_cp1253},
+ {-1}, {-1},
+#line 27 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str378, ei_ucs2be},
+ {-1}, {-1}, {-1},
+#line 73 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str382, ei_iso8859_3},
+ {-1}, {-1},
+#line 45 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str385, ei_utf7},
+ {-1},
+#line 36 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_ucs4be},
+#line 255 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_cp874},
+ {-1}, {-1}, {-1},
+#line 44 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_utf7},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+#line 169 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str398, ei_koi8_u},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 198 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_cp850},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1},
+#line 43 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str436, ei_utf32le},
+#line 222 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_mac_turkish},
+ {-1},
+#line 185 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str439, ei_cp1254},
+#line 251 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_tis620},
+#line 77 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str441, ei_iso8859_3},
+ {-1}, {-1},
+#line 105 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_7},
+ {-1}, {-1}, {-1}, {-1},
+#line 106 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_iso8859_7},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 188 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_cp1255},
+ {-1}, {-1}, {-1},
+#line 47 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str461, ei_ucs2internal},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 39 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_utf16be},
+ {-1},
+#line 49 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_ucs4internal},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1},
+#line 20 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str490, ei_ascii},
+ {-1},
+#line 170 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_koi8_ru},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 262 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str499, ei_tcvn},
+ {-1}, {-1}, {-1}, {-1},
+#line 223 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_mac_hebrew},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+#line 246 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_cp1133},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 28 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str538, ei_ucs2be},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 42 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_utf32be},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1},
+#line 191 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_cp1256},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+#line 32 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str576, ei_ucs2le},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 200 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_cp850},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 194 "aliases_nocjk.gperf"
+ {(int)(long)&((struct stringpool_t *)0)->stringpool_str622, ei_cp1257}
+ };
+
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct alias *
+aliases_lookup (const char *str, unsigned int len)
+{
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ int key = aliases_hash (str, len);
+
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ int o = aliases[key].name;
+ if (o >= 0)
+ {
+ const char *s = o + stringpool;
+
+ if (*str == *s && !strcmp (str + 1, s + 1))
+ return &aliases[key];
+ }
+ }
+ }
+ return 0;
+}
diff --git a/contrib/libs/libiconv/canonical_local_nocjk.h b/contrib/libs/libiconv/canonical_local_nocjk.h
index 574922102c..d6390f91ad 100644
--- a/contrib/libs/libiconv/canonical_local_nocjk.h
+++ b/contrib/libs/libiconv/canonical_local_nocjk.h
@@ -1,2 +1,2 @@
- (int)(long)&((struct stringpool_t *)0)->stringpool_str213,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str334,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str213,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str334,
diff --git a/contrib/libs/libiconv/canonical_nocjk.h b/contrib/libs/libiconv/canonical_nocjk.h
index bf980b47fd..87cf24dca3 100644
--- a/contrib/libs/libiconv/canonical_nocjk.h
+++ b/contrib/libs/libiconv/canonical_nocjk.h
@@ -1,78 +1,78 @@
- (int)(long)&((struct stringpool_t *)0)->stringpool_str150,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str258,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str146,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str378,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str266,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str164,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str275,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str241,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str468,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str316,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str436,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str392,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str461,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str470,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str41,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str9,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str75,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str71,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str89,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str95,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str81,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str101,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str109,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str220,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str78,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str248,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str92,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str98,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str84,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str302,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str398,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str492,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str171,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str29,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str25,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str199,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str43,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str49,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str35,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str189,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str55,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str170,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str17,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str27,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str106,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str198,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str338,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str321,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str188,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str371,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str326,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str229,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str437,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str345,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str126,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str232,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str202,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str133,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str166,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str280,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str124,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str276,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str240,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str112,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str19,
- (int)(long)&((struct stringpool_t *)0)->stringpool_str114,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str150,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str258,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str146,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str378,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str266,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str164,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str275,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str241,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str468,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str316,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str436,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str392,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str461,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str470,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str41,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str9,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str75,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str71,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str89,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str95,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str81,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str101,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str109,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str220,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str78,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str248,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str92,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str98,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str84,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str302,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str398,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str492,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str171,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str29,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str25,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str199,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str43,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str49,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str35,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str189,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str55,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str170,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str17,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str27,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str106,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str198,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str338,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str321,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str188,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str371,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str326,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str229,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str437,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str345,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str126,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str232,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str202,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str133,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str166,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str280,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str124,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str276,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str240,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str112,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str19,
+ (int)(long)&((struct stringpool_t *)0)->stringpool_str114,
diff --git a/contrib/libs/libiconv/converters.h b/contrib/libs/libiconv/converters.h
index c67fa08bf8..77649424d3 100644
--- a/contrib/libs/libiconv/converters.h
+++ b/contrib/libs/libiconv/converters.h
@@ -219,8 +219,8 @@ typedef struct {
#include "big5.h"
#include "ksc5601.h"
-#endif
-
+#endif
+
#include "johab_hangul.h"
/* CJK encodings [CES = character encoding scheme] [CJKV.INF chapter 4] */
@@ -251,7 +251,7 @@ typedef struct {
#include "cp949.h"
#include "johab.h"
#include "iso2022_kr.h"
-#endif
+#endif
/* Encodings used by system dependent locales. */
diff --git a/contrib/libs/libiconv/encodings.def b/contrib/libs/libiconv/encodings.def
index d5c739a26a..674f147d78 100644
--- a/contrib/libs/libiconv/encodings.def
+++ b/contrib/libs/libiconv/encodings.def
@@ -1023,4 +1023,4 @@ DEFENCODING(( "ISO-2022-KR", /* IANA, RFC 1557 */
),
iso2022_kr,
{ iso2022_kr_mbtowc, NULL }, { iso2022_kr_wctomb, iso2022_kr_reset })
-#endif
+#endif
diff --git a/contrib/libs/libiconv/gencanonical.sh b/contrib/libs/libiconv/gencanonical.sh
index 8287962baa..275b2348f4 100755
--- a/contrib/libs/libiconv/gencanonical.sh
+++ b/contrib/libs/libiconv/gencanonical.sh
@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
-
-gperf -m10 aliases_nocjk.gperf | sed 's/register //g' >aliases_nocjk.h
-
-cat aliases_nocjk.gperf | sed 1d | grep -v ^% | uniq -f1 | cut -d, -f1 | head -n -2 | xargs -n1 -IXXX grep '"XXX"' aliases_nocjk.h | grep -Eo "_str[0-9]+" | sed 's/^/ (int)(long)\&((struct stringpool_t *)0)->stringpool/;s/$/,/' >canonical_nocjk.h
-
-cat aliases_nocjk.gperf | sed 1d | grep -v ^% | uniq -f1 | cut -d, -f1 | tail -n 2 | xargs -n1 -IXXX grep '"XXX"' aliases_nocjk.h | grep -Eo "_str[0-9]+" | sed 's/^/ (int)(long)\&((struct stringpool_t *)0)->stringpool/;s/$/,/' >canonical_local_nocjk.h
+#!/usr/bin/env bash
+
+gperf -m10 aliases_nocjk.gperf | sed 's/register //g' >aliases_nocjk.h
+
+cat aliases_nocjk.gperf | sed 1d | grep -v ^% | uniq -f1 | cut -d, -f1 | head -n -2 | xargs -n1 -IXXX grep '"XXX"' aliases_nocjk.h | grep -Eo "_str[0-9]+" | sed 's/^/ (int)(long)\&((struct stringpool_t *)0)->stringpool/;s/$/,/' >canonical_nocjk.h
+
+cat aliases_nocjk.gperf | sed 1d | grep -v ^% | uniq -f1 | cut -d, -f1 | tail -n 2 | xargs -n1 -IXXX grep '"XXX"' aliases_nocjk.h | grep -Eo "_str[0-9]+" | sed 's/^/ (int)(long)\&((struct stringpool_t *)0)->stringpool/;s/$/,/' >canonical_local_nocjk.h
diff --git a/contrib/libs/libiconv/iconv.c b/contrib/libs/libiconv/iconv.c
index 69f70c2f8e..3933653205 100644
--- a/contrib/libs/libiconv/iconv.c
+++ b/contrib/libs/libiconv/iconv.c
@@ -147,7 +147,7 @@ static struct encoding const all_encodings[] = {
#elif defined __sun
# include "aliases_syssolaris.h"
#elif defined(ARCADIA_ICONV_NOCJK)
-# include "aliases_nocjk.h"
+# include "aliases_nocjk.h"
#else
# include "aliases.h"
#endif
@@ -444,7 +444,7 @@ static const unsigned short all_canonical[] = {
#elif defined __sun
# include "canonical_syssolaris.h"
#elif defined(ARCADIA_ICONV_NOCJK)
-# include "canonical_nocjk.h"
+# include "canonical_nocjk.h"
#else
# include "canonical.h"
#endif
@@ -477,7 +477,7 @@ static const unsigned short all_canonical[] = {
#elif defined __sun
# include "canonical_local_syssolaris.h"
#elif defined(ARCADIA_ICONV_NOCJK)
-# include "canonical_local_nocjk.h"
+# include "canonical_local_nocjk.h"
#else
# include "canonical_local.h"
#endif
diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make
index 9c4640fdcf..abd88f0cb3 100644
--- a/contrib/libs/ya.make
+++ b/contrib/libs/ya.make
@@ -136,7 +136,7 @@ RECURSE(
libarchive
libbpf
libbz2
- libc_compat
+ libc_compat
libc_userver_workarounds
libcpuid
libcroco
@@ -349,7 +349,7 @@ RECURSE(
valgrind
vlfeat
vmaf
- wapiti
+ wapiti
webrtc
websocketpp
woff2
@@ -431,7 +431,7 @@ ENDIF()
IF (OS_ANDROID)
RECURSE(
android_cpufeatures
- android_crazy_linker
+ android_crazy_linker
)
ENDIF()
diff --git a/contrib/restricted/ya.make b/contrib/restricted/ya.make
index b52a206733..acc2392051 100644
--- a/contrib/restricted/ya.make
+++ b/contrib/restricted/ya.make
@@ -66,7 +66,7 @@ IF(OS_LINUX OR OS_DARWIN)
boost/libs/python/arcadia_test
)
ENDIF()
-
-IF(OS_ANDROID)
- RECURSE(ashmem)
-ENDIF()
+
+IF(OS_ANDROID)
+ RECURSE(ashmem)
+ENDIF()
diff --git a/contrib/tools/ya.make b/contrib/tools/ya.make
index 750911c587..0582c3bba6 100644
--- a/contrib/tools/ya.make
+++ b/contrib/tools/ya.make
@@ -44,7 +44,7 @@ RECURSE(
unbound
unbound/build
vowpal_wabbit
- wapiti
+ wapiti
word2vec
xdelta3
xsltproc
diff --git a/library/cpp/blockcodecs/README.md b/library/cpp/blockcodecs/README.md
index 417917a475..e59beab023 100644
--- a/library/cpp/blockcodecs/README.md
+++ b/library/cpp/blockcodecs/README.md
@@ -15,9 +15,9 @@ Streaming
=========
Use `stream.h` to obtain simple streams over block codecs (buffer data, compress them by blocks,
write to the resulting stream).
-
-Using codec plugins
-===================
-If you don't want your code to bloat from unused codecs, you can use the small version of the
+
+Using codec plugins
+===================
+If you don't want your code to bloat from unused codecs, you can use the small version of the
library: `library/cpp/blockcodecs/core`. In that case, you need to manually set `PEERDIR()`s to
needed codecs (i.e. `PEERDIR(library/cpp/blockcodecs/codecs/lzma)`).
diff --git a/library/cpp/blockcodecs/codecs.cpp b/library/cpp/blockcodecs/codecs.cpp
index fdec4809d3..7690558f60 100644
--- a/library/cpp/blockcodecs/codecs.cpp
+++ b/library/cpp/blockcodecs/codecs.cpp
@@ -1 +1 @@
-#include "codecs.h"
+#include "codecs.h"
diff --git a/library/cpp/blockcodecs/codecs.h b/library/cpp/blockcodecs/codecs.h
index fd499b54b0..1343ca31ac 100644
--- a/library/cpp/blockcodecs/codecs.h
+++ b/library/cpp/blockcodecs/codecs.h
@@ -1,3 +1,3 @@
-#pragma once
-
+#pragma once
+
#include <library/cpp/blockcodecs/core/codecs.h>
diff --git a/library/cpp/blockcodecs/codecs/brotli/brotli.cpp b/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
index 6e3cd971bd..ed16c426b5 100644
--- a/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
+++ b/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
@@ -1,67 +1,67 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/brotli/include/brotli/encode.h>
-#include <contrib/libs/brotli/include/brotli/decode.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TBrotliCodec : public TAddLengthCodec<TBrotliCodec> {
- static constexpr int BEST_QUALITY = 11;
-
- inline TBrotliCodec(ui32 level)
- : Quality(level)
+
+#include <contrib/libs/brotli/include/brotli/encode.h>
+#include <contrib/libs/brotli/include/brotli/decode.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TBrotliCodec : public TAddLengthCodec<TBrotliCodec> {
+ static constexpr int BEST_QUALITY = 11;
+
+ inline TBrotliCodec(ui32 level)
+ : Quality(level)
, MyName(TStringBuf("brotli_") + ToString(level))
- {
- }
-
- static inline size_t DoMaxCompressedLength(size_t l) noexcept {
- return BrotliEncoderMaxCompressedSize(l);
- }
-
- inline size_t DoCompress(const TData& in, void* out) const {
- size_t resultSize = MaxCompressedLength(in);
- auto result = BrotliEncoderCompress(
- /*quality*/ Quality,
- /*window*/ BROTLI_DEFAULT_WINDOW,
- /*mode*/ BrotliEncoderMode::BROTLI_MODE_GENERIC,
- /*input_size*/ in.size(),
- /*input_buffer*/ (const unsigned char*)(in.data()),
- /*encoded_size*/ &resultSize,
- /*encoded_buffer*/ static_cast<unsigned char*>(out));
- if (result != BROTLI_TRUE) {
- ythrow yexception() << "internal brotli error during compression";
- }
-
- return resultSize;
- }
-
- inline void DoDecompress(const TData& in, void* out, size_t dsize) const {
- size_t decoded = dsize;
- auto result = BrotliDecoderDecompress(in.size(), (const unsigned char*)in.data(), &decoded, static_cast<unsigned char*>(out));
- if (result != BROTLI_DECODER_RESULT_SUCCESS) {
- ythrow yexception() << "internal brotli error during decompression";
- } else if (decoded != dsize) {
- ythrow TDecompressError(dsize, decoded);
- }
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- const int Quality = BEST_QUALITY;
- const TString MyName;
- };
-
- struct TBrotliRegistrar {
- TBrotliRegistrar() {
- for (int i = 1; i <= TBrotliCodec::BEST_QUALITY; ++i) {
+ {
+ }
+
+ static inline size_t DoMaxCompressedLength(size_t l) noexcept {
+ return BrotliEncoderMaxCompressedSize(l);
+ }
+
+ inline size_t DoCompress(const TData& in, void* out) const {
+ size_t resultSize = MaxCompressedLength(in);
+ auto result = BrotliEncoderCompress(
+ /*quality*/ Quality,
+ /*window*/ BROTLI_DEFAULT_WINDOW,
+ /*mode*/ BrotliEncoderMode::BROTLI_MODE_GENERIC,
+ /*input_size*/ in.size(),
+ /*input_buffer*/ (const unsigned char*)(in.data()),
+ /*encoded_size*/ &resultSize,
+ /*encoded_buffer*/ static_cast<unsigned char*>(out));
+ if (result != BROTLI_TRUE) {
+ ythrow yexception() << "internal brotli error during compression";
+ }
+
+ return resultSize;
+ }
+
+ inline void DoDecompress(const TData& in, void* out, size_t dsize) const {
+ size_t decoded = dsize;
+ auto result = BrotliDecoderDecompress(in.size(), (const unsigned char*)in.data(), &decoded, static_cast<unsigned char*>(out));
+ if (result != BROTLI_DECODER_RESULT_SUCCESS) {
+ ythrow yexception() << "internal brotli error during decompression";
+ } else if (decoded != dsize) {
+ ythrow TDecompressError(dsize, decoded);
+ }
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ const int Quality = BEST_QUALITY;
+ const TString MyName;
+ };
+
+ struct TBrotliRegistrar {
+ TBrotliRegistrar() {
+ for (int i = 1; i <= TBrotliCodec::BEST_QUALITY; ++i) {
RegisterCodec(MakeHolder<TBrotliCodec>(i));
- }
- }
- };
+ }
+ }
+ };
const TBrotliRegistrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/brotli/ya.make b/library/cpp/blockcodecs/codecs/brotli/ya.make
index 17aff0bb72..6425fc990a 100644
--- a/library/cpp/blockcodecs/codecs/brotli/ya.make
+++ b/library/cpp/blockcodecs/codecs/brotli/ya.make
@@ -1,15 +1,15 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/brotli/enc
- contrib/libs/brotli/dec
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/brotli/enc
+ contrib/libs/brotli/dec
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL brotli.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL brotli.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/bzip/bzip.cpp b/library/cpp/blockcodecs/codecs/bzip/bzip.cpp
index 3a5cfdd0e9..851c1447c3 100644
--- a/library/cpp/blockcodecs/codecs/bzip/bzip.cpp
+++ b/library/cpp/blockcodecs/codecs/bzip/bzip.cpp
@@ -1,62 +1,62 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/libbz2/bzlib.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TBZipCodec: public TAddLengthCodec<TBZipCodec> {
- inline TBZipCodec(int level)
- : Level(level)
- , MyName("bzip2-" + ToString(Level))
- {
- }
-
- static inline size_t DoMaxCompressedLength(size_t in) noexcept {
- // very strange
- return in * 2 + 128;
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- inline size_t DoCompress(const TData& in, void* buf) const {
- unsigned int ret = DoMaxCompressedLength(in.size());
- const int res = BZ2_bzBuffToBuffCompress((char*)buf, &ret, (char*)in.data(), in.size(), Level, 0, 0);
- if (res != BZ_OK) {
- ythrow TCompressError(res);
- }
-
- return ret;
- }
-
- inline void DoDecompress(const TData& in, void* out, size_t len) const {
- unsigned int tmp = SafeIntegerCast<unsigned int>(len);
- const int res = BZ2_bzBuffToBuffDecompress((char*)out, &tmp, (char*)in.data(), in.size(), 0, 0);
-
- if (res != BZ_OK) {
- ythrow TDecompressError(res);
- }
-
- if (len != tmp) {
- ythrow TDecompressError(len, tmp);
- }
- }
-
- const int Level;
- const TString MyName;
- };
-
- struct TBZipRegistrar {
- TBZipRegistrar() {
- for (int i = 1; i < 10; ++i) {
+
+#include <contrib/libs/libbz2/bzlib.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TBZipCodec: public TAddLengthCodec<TBZipCodec> {
+ inline TBZipCodec(int level)
+ : Level(level)
+ , MyName("bzip2-" + ToString(Level))
+ {
+ }
+
+ static inline size_t DoMaxCompressedLength(size_t in) noexcept {
+ // very strange
+ return in * 2 + 128;
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ inline size_t DoCompress(const TData& in, void* buf) const {
+ unsigned int ret = DoMaxCompressedLength(in.size());
+ const int res = BZ2_bzBuffToBuffCompress((char*)buf, &ret, (char*)in.data(), in.size(), Level, 0, 0);
+ if (res != BZ_OK) {
+ ythrow TCompressError(res);
+ }
+
+ return ret;
+ }
+
+ inline void DoDecompress(const TData& in, void* out, size_t len) const {
+ unsigned int tmp = SafeIntegerCast<unsigned int>(len);
+ const int res = BZ2_bzBuffToBuffDecompress((char*)out, &tmp, (char*)in.data(), in.size(), 0, 0);
+
+ if (res != BZ_OK) {
+ ythrow TDecompressError(res);
+ }
+
+ if (len != tmp) {
+ ythrow TDecompressError(len, tmp);
+ }
+ }
+
+ const int Level;
+ const TString MyName;
+ };
+
+ struct TBZipRegistrar {
+ TBZipRegistrar() {
+ for (int i = 1; i < 10; ++i) {
RegisterCodec(MakeHolder<TBZipCodec>(i));
- }
- RegisterAlias("bzip2", "bzip2-6");
- }
- };
+ }
+ RegisterAlias("bzip2", "bzip2-6");
+ }
+ };
const TBZipRegistrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/bzip/ya.make b/library/cpp/blockcodecs/codecs/bzip/ya.make
index f0a8aefd62..ddf2f7b29f 100644
--- a/library/cpp/blockcodecs/codecs/bzip/ya.make
+++ b/library/cpp/blockcodecs/codecs/bzip/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/libbz2
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/libbz2
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL bzip.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL bzip.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp b/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp
index da2831fbd2..1fe7bb3a7d 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp
+++ b/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp
@@ -1,54 +1,54 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/fastlz/fastlz.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TFastLZCodec: public TAddLengthCodec<TFastLZCodec> {
- inline TFastLZCodec(int level)
- : MyName("fastlz-" + ToString(level))
- , Level(level)
- {
- }
-
- static inline size_t DoMaxCompressedLength(size_t in) noexcept {
- return Max<size_t>(in + in / 20, 128);
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- inline size_t DoCompress(const TData& in, void* buf) const {
- if (Level) {
- return fastlz_compress_level(Level, in.data(), in.size(), buf);
- }
-
- return fastlz_compress(in.data(), in.size(), buf);
- }
-
- inline void DoDecompress(const TData& in, void* out, size_t len) const {
- const int ret = fastlz_decompress(in.data(), in.size(), out, len);
-
- if (ret < 0 || (size_t)ret != len) {
+
+#include <contrib/libs/fastlz/fastlz.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TFastLZCodec: public TAddLengthCodec<TFastLZCodec> {
+ inline TFastLZCodec(int level)
+ : MyName("fastlz-" + ToString(level))
+ , Level(level)
+ {
+ }
+
+ static inline size_t DoMaxCompressedLength(size_t in) noexcept {
+ return Max<size_t>(in + in / 20, 128);
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ inline size_t DoCompress(const TData& in, void* buf) const {
+ if (Level) {
+ return fastlz_compress_level(Level, in.data(), in.size(), buf);
+ }
+
+ return fastlz_compress(in.data(), in.size(), buf);
+ }
+
+ inline void DoDecompress(const TData& in, void* out, size_t len) const {
+ const int ret = fastlz_decompress(in.data(), in.size(), out, len);
+
+ if (ret < 0 || (size_t)ret != len) {
ythrow TDataError() << TStringBuf("can not decompress");
- }
- }
-
- const TString MyName;
- const int Level;
- };
-
- struct TFastLZRegistrar {
- TFastLZRegistrar() {
- for (int i = 0; i < 3; ++i) {
+ }
+ }
+
+ const TString MyName;
+ const int Level;
+ };
+
+ struct TFastLZRegistrar {
+ TFastLZRegistrar() {
+ for (int i = 0; i < 3; ++i) {
RegisterCodec(MakeHolder<TFastLZCodec>(i));
- }
- RegisterAlias("fastlz", "fastlz-0");
- }
- };
+ }
+ RegisterAlias("fastlz", "fastlz-0");
+ }
+ };
const TFastLZRegistrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/fastlz/ya.make b/library/cpp/blockcodecs/codecs/fastlz/ya.make
index 59c09b329b..87bbb298cf 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/ya.make
+++ b/library/cpp/blockcodecs/codecs/fastlz/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/fastlz
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/fastlz
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL fastlz.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL fastlz.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/legacy_zstd06.cpp b/library/cpp/blockcodecs/codecs/legacy_zstd06/legacy_zstd06.cpp
index 042f031679..58c4808273 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/legacy_zstd06.cpp
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/legacy_zstd06.cpp
@@ -47,12 +47,12 @@ namespace {
const TString MyName;
};
- struct TZStd06Registrar {
- TZStd06Registrar() {
- for (unsigned i = 1; i <= ZSTD_maxCLevel(); ++i) {
+ struct TZStd06Registrar {
+ TZStd06Registrar() {
+ for (unsigned i = 1; i <= ZSTD_maxCLevel(); ++i) {
RegisterCodec(MakeHolder<TZStd06Codec>(i));
- }
+ }
}
- };
+ };
const TZStd06Registrar Registrar{};
}
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/ya.make b/library/cpp/blockcodecs/codecs/legacy_zstd06/ya.make
index 067f731233..f042befbbe 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/ya.make
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/zstd06
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/zstd06
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL legacy_zstd06.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL legacy_zstd06.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/lz4/lz4.cpp b/library/cpp/blockcodecs/codecs/lz4/lz4.cpp
index fbf0fe110f..7ece0ad448 100644
--- a/library/cpp/blockcodecs/codecs/lz4/lz4.cpp
+++ b/library/cpp/blockcodecs/codecs/lz4/lz4.cpp
@@ -1,123 +1,123 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/lz4/lz4.h>
-#include <contrib/libs/lz4/lz4hc.h>
-#include <contrib/libs/lz4/generated/iface.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TLz4Base {
- static inline size_t DoMaxCompressedLength(size_t in) {
- return LZ4_compressBound(SafeIntegerCast<int>(in));
- }
- };
-
- struct TLz4FastCompress {
- inline TLz4FastCompress(int memory)
- : Memory(memory)
- , Methods(LZ4Methods(Memory))
- {
- }
-
- inline size_t DoCompress(const TData& in, void* buf) const {
- return Methods->LZ4CompressLimited(in.data(), (char*)buf, in.size(), LZ4_compressBound(in.size()));
- }
-
- inline TString CPrefix() {
- return "fast" + ToString(Memory);
- }
-
- const int Memory;
- const TLZ4Methods* Methods;
- };
-
- struct TLz4BestCompress {
- inline size_t DoCompress(const TData& in, void* buf) const {
- return LZ4_compress_HC(in.data(), (char*)buf, in.size(), LZ4_compressBound(in.size()), 0);
- }
-
- static inline TString CPrefix() {
- return "hc";
- }
- };
-
- struct TLz4FastDecompress {
- inline void DoDecompress(const TData& in, void* out, size_t len) const {
- ssize_t res = LZ4_decompress_fast(in.data(), (char*)out, len);
- if (res < 0) {
- ythrow TDecompressError(res);
- }
- }
-
- static inline TStringBuf DPrefix() {
+
+#include <contrib/libs/lz4/lz4.h>
+#include <contrib/libs/lz4/lz4hc.h>
+#include <contrib/libs/lz4/generated/iface.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TLz4Base {
+ static inline size_t DoMaxCompressedLength(size_t in) {
+ return LZ4_compressBound(SafeIntegerCast<int>(in));
+ }
+ };
+
+ struct TLz4FastCompress {
+ inline TLz4FastCompress(int memory)
+ : Memory(memory)
+ , Methods(LZ4Methods(Memory))
+ {
+ }
+
+ inline size_t DoCompress(const TData& in, void* buf) const {
+ return Methods->LZ4CompressLimited(in.data(), (char*)buf, in.size(), LZ4_compressBound(in.size()));
+ }
+
+ inline TString CPrefix() {
+ return "fast" + ToString(Memory);
+ }
+
+ const int Memory;
+ const TLZ4Methods* Methods;
+ };
+
+ struct TLz4BestCompress {
+ inline size_t DoCompress(const TData& in, void* buf) const {
+ return LZ4_compress_HC(in.data(), (char*)buf, in.size(), LZ4_compressBound(in.size()), 0);
+ }
+
+ static inline TString CPrefix() {
+ return "hc";
+ }
+ };
+
+ struct TLz4FastDecompress {
+ inline void DoDecompress(const TData& in, void* out, size_t len) const {
+ ssize_t res = LZ4_decompress_fast(in.data(), (char*)out, len);
+ if (res < 0) {
+ ythrow TDecompressError(res);
+ }
+ }
+
+ static inline TStringBuf DPrefix() {
return TStringBuf("fast");
- }
- };
-
- struct TLz4SafeDecompress {
- inline void DoDecompress(const TData& in, void* out, size_t len) const {
- ssize_t res = LZ4_decompress_safe(in.data(), (char*)out, in.size(), len);
- if (res < 0) {
- ythrow TDecompressError(res);
- }
- }
-
- static inline TStringBuf DPrefix() {
+ }
+ };
+
+ struct TLz4SafeDecompress {
+ inline void DoDecompress(const TData& in, void* out, size_t len) const {
+ ssize_t res = LZ4_decompress_safe(in.data(), (char*)out, in.size(), len);
+ if (res < 0) {
+ ythrow TDecompressError(res);
+ }
+ }
+
+ static inline TStringBuf DPrefix() {
return TStringBuf("safe");
- }
- };
-
- template <class TC, class TD>
- struct TLz4Codec: public TAddLengthCodec<TLz4Codec<TC, TD>>, public TLz4Base, public TC, public TD {
- inline TLz4Codec()
- : MyName("lz4-" + TC::CPrefix() + "-" + TD::DPrefix())
- {
- }
-
- template <class T>
- inline TLz4Codec(const T& t)
- : TC(t)
- , MyName("lz4-" + TC::CPrefix() + "-" + TD::DPrefix())
- {
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- const TString MyName;
- };
-
- struct TLz4Registrar {
- TLz4Registrar() {
- for (int i = 0; i < 30; ++i) {
- typedef TLz4Codec<TLz4FastCompress, TLz4FastDecompress> T1;
- typedef TLz4Codec<TLz4FastCompress, TLz4SafeDecompress> T2;
-
- THolder<T1> t1(new T1(i));
- THolder<T2> t2(new T2(i));
-
- if (t1->Methods) {
+ }
+ };
+
+ template <class TC, class TD>
+ struct TLz4Codec: public TAddLengthCodec<TLz4Codec<TC, TD>>, public TLz4Base, public TC, public TD {
+ inline TLz4Codec()
+ : MyName("lz4-" + TC::CPrefix() + "-" + TD::DPrefix())
+ {
+ }
+
+ template <class T>
+ inline TLz4Codec(const T& t)
+ : TC(t)
+ , MyName("lz4-" + TC::CPrefix() + "-" + TD::DPrefix())
+ {
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ const TString MyName;
+ };
+
+ struct TLz4Registrar {
+ TLz4Registrar() {
+ for (int i = 0; i < 30; ++i) {
+ typedef TLz4Codec<TLz4FastCompress, TLz4FastDecompress> T1;
+ typedef TLz4Codec<TLz4FastCompress, TLz4SafeDecompress> T2;
+
+ THolder<T1> t1(new T1(i));
+ THolder<T2> t2(new T2(i));
+
+ if (t1->Methods) {
RegisterCodec(std::move(t1));
- }
-
- if (t2->Methods) {
+ }
+
+ if (t2->Methods) {
RegisterCodec(std::move(t2));
- }
- }
-
+ }
+ }
+
RegisterCodec(MakeHolder<TLz4Codec<TLz4BestCompress, TLz4FastDecompress>>());
RegisterCodec(MakeHolder<TLz4Codec<TLz4BestCompress, TLz4SafeDecompress>>());
-
- RegisterAlias("lz4-fast-safe", "lz4-fast14-safe");
- RegisterAlias("lz4-fast-fast", "lz4-fast14-fast");
- RegisterAlias("lz4", "lz4-fast-safe");
- RegisterAlias("lz4fast", "lz4-fast-fast");
- RegisterAlias("lz4hc", "lz4-hc-safe");
- }
- };
+
+ RegisterAlias("lz4-fast-safe", "lz4-fast14-safe");
+ RegisterAlias("lz4-fast-fast", "lz4-fast14-fast");
+ RegisterAlias("lz4", "lz4-fast-safe");
+ RegisterAlias("lz4fast", "lz4-fast-fast");
+ RegisterAlias("lz4hc", "lz4-hc-safe");
+ }
+ };
const TLz4Registrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/lz4/ya.make b/library/cpp/blockcodecs/codecs/lz4/ya.make
index f2471d7d96..112ef8ee80 100644
--- a/library/cpp/blockcodecs/codecs/lz4/ya.make
+++ b/library/cpp/blockcodecs/codecs/lz4/ya.make
@@ -1,15 +1,15 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/lz4
- contrib/libs/lz4/generated
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/lz4
+ contrib/libs/lz4/generated
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL lz4.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL lz4.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/lzma/lzma.cpp b/library/cpp/blockcodecs/codecs/lzma/lzma.cpp
index 6c8d5fded4..eb52842aee 100644
--- a/library/cpp/blockcodecs/codecs/lzma/lzma.cpp
+++ b/library/cpp/blockcodecs/codecs/lzma/lzma.cpp
@@ -1,74 +1,74 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/lzmasdk/LzmaLib.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TLzmaCodec: public TAddLengthCodec<TLzmaCodec> {
- inline TLzmaCodec(int level)
- : Level(level)
- , MyName("lzma-" + ToString(Level))
- {
- }
-
- static inline size_t DoMaxCompressedLength(size_t in) noexcept {
- return Max<size_t>(in + in / 20, 128) + LZMA_PROPS_SIZE;
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- inline size_t DoCompress(const TData& in, void* buf) const {
- unsigned char* props = (unsigned char*)buf;
- unsigned char* data = props + LZMA_PROPS_SIZE;
- size_t destLen = Max<size_t>();
- size_t outPropsSize = LZMA_PROPS_SIZE;
-
- const int ret = LzmaCompress(data, &destLen, (const unsigned char*)in.data(), in.size(), props, &outPropsSize, Level, 0, -1, -1, -1, -1, -1);
-
- if (ret != SZ_OK) {
- ythrow TCompressError(ret);
- }
-
- return destLen + LZMA_PROPS_SIZE;
- }
-
- inline void DoDecompress(const TData& in, void* out, size_t len) const {
- if (in.size() <= LZMA_PROPS_SIZE) {
+
+#include <contrib/libs/lzmasdk/LzmaLib.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TLzmaCodec: public TAddLengthCodec<TLzmaCodec> {
+ inline TLzmaCodec(int level)
+ : Level(level)
+ , MyName("lzma-" + ToString(Level))
+ {
+ }
+
+ static inline size_t DoMaxCompressedLength(size_t in) noexcept {
+ return Max<size_t>(in + in / 20, 128) + LZMA_PROPS_SIZE;
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ inline size_t DoCompress(const TData& in, void* buf) const {
+ unsigned char* props = (unsigned char*)buf;
+ unsigned char* data = props + LZMA_PROPS_SIZE;
+ size_t destLen = Max<size_t>();
+ size_t outPropsSize = LZMA_PROPS_SIZE;
+
+ const int ret = LzmaCompress(data, &destLen, (const unsigned char*)in.data(), in.size(), props, &outPropsSize, Level, 0, -1, -1, -1, -1, -1);
+
+ if (ret != SZ_OK) {
+ ythrow TCompressError(ret);
+ }
+
+ return destLen + LZMA_PROPS_SIZE;
+ }
+
+ inline void DoDecompress(const TData& in, void* out, size_t len) const {
+ if (in.size() <= LZMA_PROPS_SIZE) {
ythrow TDataError() << TStringBuf("broken lzma stream");
- }
-
- const unsigned char* props = (const unsigned char*)in.data();
- const unsigned char* data = props + LZMA_PROPS_SIZE;
- size_t destLen = len;
- SizeT srcLen = in.size() - LZMA_PROPS_SIZE;
-
- const int res = LzmaUncompress((unsigned char*)out, &destLen, data, &srcLen, props, LZMA_PROPS_SIZE);
-
- if (res != SZ_OK) {
- ythrow TDecompressError(res);
- }
-
- if (destLen != len) {
- ythrow TDecompressError(len, destLen);
- }
- }
-
- const int Level;
- const TString MyName;
- };
-
- struct TLzmaRegistrar {
- TLzmaRegistrar() {
- for (int i = 0; i < 10; ++i) {
+ }
+
+ const unsigned char* props = (const unsigned char*)in.data();
+ const unsigned char* data = props + LZMA_PROPS_SIZE;
+ size_t destLen = len;
+ SizeT srcLen = in.size() - LZMA_PROPS_SIZE;
+
+ const int res = LzmaUncompress((unsigned char*)out, &destLen, data, &srcLen, props, LZMA_PROPS_SIZE);
+
+ if (res != SZ_OK) {
+ ythrow TDecompressError(res);
+ }
+
+ if (destLen != len) {
+ ythrow TDecompressError(len, destLen);
+ }
+ }
+
+ const int Level;
+ const TString MyName;
+ };
+
+ struct TLzmaRegistrar {
+ TLzmaRegistrar() {
+ for (int i = 0; i < 10; ++i) {
RegisterCodec(MakeHolder<TLzmaCodec>(i));
- }
- RegisterAlias("lzma", "lzma-5");
- }
- };
+ }
+ RegisterAlias("lzma", "lzma-5");
+ }
+ };
const TLzmaRegistrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/lzma/ya.make b/library/cpp/blockcodecs/codecs/lzma/ya.make
index e145834da6..11f38eca71 100644
--- a/library/cpp/blockcodecs/codecs/lzma/ya.make
+++ b/library/cpp/blockcodecs/codecs/lzma/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/lzmasdk
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/lzmasdk
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL lzma.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL lzma.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/snappy/snappy.cpp b/library/cpp/blockcodecs/codecs/snappy/snappy.cpp
index f6be05a05f..0cacc876de 100644
--- a/library/cpp/blockcodecs/codecs/snappy/snappy.cpp
+++ b/library/cpp/blockcodecs/codecs/snappy/snappy.cpp
@@ -1,52 +1,52 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/snappy/snappy.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TSnappyCodec: public ICodec {
- size_t DecompressedLength(const TData& in) const override {
- size_t ret;
-
- if (snappy::GetUncompressedLength(in.data(), in.size(), &ret)) {
- return ret;
- }
-
- ythrow TDecompressError(0);
- }
-
- size_t MaxCompressedLength(const TData& in) const override {
- return snappy::MaxCompressedLength(in.size());
- }
-
- size_t Compress(const TData& in, void* out) const override {
- size_t ret;
-
- snappy::RawCompress(in.data(), in.size(), (char*)out, &ret);
-
- return ret;
- }
-
- size_t Decompress(const TData& in, void* out) const override {
- if (snappy::RawUncompress(in.data(), in.size(), (char*)out)) {
- return DecompressedLength(in);
- }
-
- ythrow TDecompressError(0);
- }
-
- TStringBuf Name() const noexcept override {
- return "snappy";
- }
- };
-
- struct TSnappyRegistrar {
- TSnappyRegistrar() {
+
+#include <contrib/libs/snappy/snappy.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TSnappyCodec: public ICodec {
+ size_t DecompressedLength(const TData& in) const override {
+ size_t ret;
+
+ if (snappy::GetUncompressedLength(in.data(), in.size(), &ret)) {
+ return ret;
+ }
+
+ ythrow TDecompressError(0);
+ }
+
+ size_t MaxCompressedLength(const TData& in) const override {
+ return snappy::MaxCompressedLength(in.size());
+ }
+
+ size_t Compress(const TData& in, void* out) const override {
+ size_t ret;
+
+ snappy::RawCompress(in.data(), in.size(), (char*)out, &ret);
+
+ return ret;
+ }
+
+ size_t Decompress(const TData& in, void* out) const override {
+ if (snappy::RawUncompress(in.data(), in.size(), (char*)out)) {
+ return DecompressedLength(in);
+ }
+
+ ythrow TDecompressError(0);
+ }
+
+ TStringBuf Name() const noexcept override {
+ return "snappy";
+ }
+ };
+
+ struct TSnappyRegistrar {
+ TSnappyRegistrar() {
RegisterCodec(MakeHolder<TSnappyCodec>());
- }
- };
+ }
+ };
const TSnappyRegistrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/snappy/ya.make b/library/cpp/blockcodecs/codecs/snappy/ya.make
index 0cf2be2f94..d939ef648e 100644
--- a/library/cpp/blockcodecs/codecs/snappy/ya.make
+++ b/library/cpp/blockcodecs/codecs/snappy/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/snappy
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/snappy
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL snappy.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL snappy.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/zlib/ya.make b/library/cpp/blockcodecs/codecs/zlib/ya.make
index 9f04995f66..86944366fa 100644
--- a/library/cpp/blockcodecs/codecs/zlib/ya.make
+++ b/library/cpp/blockcodecs/codecs/zlib/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/zlib
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/zlib
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL zlib.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL zlib.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/zlib/zlib.cpp b/library/cpp/blockcodecs/codecs/zlib/zlib.cpp
index cdb556c36d..077751d21b 100644
--- a/library/cpp/blockcodecs/codecs/zlib/zlib.cpp
+++ b/library/cpp/blockcodecs/codecs/zlib/zlib.cpp
@@ -1,64 +1,64 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#include <contrib/libs/zlib/zlib.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TZLibCodec: public TAddLengthCodec<TZLibCodec> {
- inline TZLibCodec(int level)
- : MyName("zlib-" + ToString(level))
- , Level(level)
- {
- }
-
- static inline size_t DoMaxCompressedLength(size_t in) noexcept {
- return compressBound(in);
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- inline size_t DoCompress(const TData& in, void* buf) const {
- //TRASH detected
- uLong ret = Max<unsigned int>();
-
- int cres = compress2((Bytef*)buf, &ret, (const Bytef*)in.data(), in.size(), Level);
-
- if (cres != Z_OK) {
- ythrow TCompressError(cres);
- }
-
- return ret;
- }
-
- inline void DoDecompress(const TData& in, void* out, size_t len) const {
- uLong ret = len;
-
- int uncres = uncompress((Bytef*)out, &ret, (const Bytef*)in.data(), in.size());
- if (uncres != Z_OK) {
- ythrow TDecompressError(uncres);
- }
-
- if (ret != len) {
- ythrow TDecompressError(len, ret);
- }
- }
-
- const TString MyName;
- const int Level;
- };
-
- struct TZLibRegistrar {
- TZLibRegistrar() {
- for (int i = 0; i < 10; ++i) {
+
+#include <contrib/libs/zlib/zlib.h>
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TZLibCodec: public TAddLengthCodec<TZLibCodec> {
+ inline TZLibCodec(int level)
+ : MyName("zlib-" + ToString(level))
+ , Level(level)
+ {
+ }
+
+ static inline size_t DoMaxCompressedLength(size_t in) noexcept {
+ return compressBound(in);
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ inline size_t DoCompress(const TData& in, void* buf) const {
+ //TRASH detected
+ uLong ret = Max<unsigned int>();
+
+ int cres = compress2((Bytef*)buf, &ret, (const Bytef*)in.data(), in.size(), Level);
+
+ if (cres != Z_OK) {
+ ythrow TCompressError(cres);
+ }
+
+ return ret;
+ }
+
+ inline void DoDecompress(const TData& in, void* out, size_t len) const {
+ uLong ret = len;
+
+ int uncres = uncompress((Bytef*)out, &ret, (const Bytef*)in.data(), in.size());
+ if (uncres != Z_OK) {
+ ythrow TDecompressError(uncres);
+ }
+
+ if (ret != len) {
+ ythrow TDecompressError(len, ret);
+ }
+ }
+
+ const TString MyName;
+ const int Level;
+ };
+
+ struct TZLibRegistrar {
+ TZLibRegistrar() {
+ for (int i = 0; i < 10; ++i) {
RegisterCodec(MakeHolder<TZLibCodec>(i));
- }
- RegisterAlias("zlib", "zlib-6");
- }
- };
+ }
+ RegisterAlias("zlib", "zlib-6");
+ }
+ };
const TZLibRegistrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs/zstd/ya.make b/library/cpp/blockcodecs/codecs/zstd/ya.make
index c077dd47b7..67435b71b2 100644
--- a/library/cpp/blockcodecs/codecs/zstd/ya.make
+++ b/library/cpp/blockcodecs/codecs/zstd/ya.make
@@ -1,14 +1,14 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
- contrib/libs/zstd
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
+ contrib/libs/zstd
library/cpp/blockcodecs/core
-)
-
-SRCS(
- GLOBAL zstd.cpp
-)
-
-END()
+)
+
+SRCS(
+ GLOBAL zstd.cpp
+)
+
+END()
diff --git a/library/cpp/blockcodecs/codecs/zstd/zstd.cpp b/library/cpp/blockcodecs/codecs/zstd/zstd.cpp
index 95299b3f6d..158747c52c 100644
--- a/library/cpp/blockcodecs/codecs/zstd/zstd.cpp
+++ b/library/cpp/blockcodecs/codecs/zstd/zstd.cpp
@@ -1,59 +1,59 @@
#include <library/cpp/blockcodecs/core/codecs.h>
#include <library/cpp/blockcodecs/core/common.h>
#include <library/cpp/blockcodecs/core/register.h>
-
-#define ZSTD_STATIC_LINKING_ONLY
+
+#define ZSTD_STATIC_LINKING_ONLY
#include <contrib/libs/zstd/include/zstd.h>
-
-using namespace NBlockCodecs;
-
-namespace {
- struct TZStd08Codec: public TAddLengthCodec<TZStd08Codec> {
- inline TZStd08Codec(unsigned level)
- : Level(level)
+
+using namespace NBlockCodecs;
+
+namespace {
+ struct TZStd08Codec: public TAddLengthCodec<TZStd08Codec> {
+ inline TZStd08Codec(unsigned level)
+ : Level(level)
, MyName(TStringBuf("zstd08_") + ToString(Level))
- {
- }
-
- static inline size_t CheckError(size_t ret, const char* what) {
- if (ZSTD_isError(ret)) {
+ {
+ }
+
+ static inline size_t CheckError(size_t ret, const char* what) {
+ if (ZSTD_isError(ret)) {
ythrow yexception() << what << TStringBuf(" zstd error: ") << ZSTD_getErrorName(ret);
- }
-
- return ret;
- }
-
- static inline size_t DoMaxCompressedLength(size_t l) noexcept {
- return ZSTD_compressBound(l);
- }
-
- inline size_t DoCompress(const TData& in, void* out) const {
- return CheckError(ZSTD_compress(out, DoMaxCompressedLength(in.size()), in.data(), in.size(), Level), "compress");
- }
-
- inline void DoDecompress(const TData& in, void* out, size_t dsize) const {
- const size_t res = CheckError(ZSTD_decompress(out, dsize, in.data(), in.size()), "decompress");
-
- if (res != dsize) {
- ythrow TDecompressError(dsize, res);
- }
- }
-
- TStringBuf Name() const noexcept override {
- return MyName;
- }
-
- const unsigned Level;
- const TString MyName;
- };
-
- struct TZStd08Registrar {
- TZStd08Registrar() {
- for (int i = 1; i <= ZSTD_maxCLevel(); ++i) {
+ }
+
+ return ret;
+ }
+
+ static inline size_t DoMaxCompressedLength(size_t l) noexcept {
+ return ZSTD_compressBound(l);
+ }
+
+ inline size_t DoCompress(const TData& in, void* out) const {
+ return CheckError(ZSTD_compress(out, DoMaxCompressedLength(in.size()), in.data(), in.size(), Level), "compress");
+ }
+
+ inline void DoDecompress(const TData& in, void* out, size_t dsize) const {
+ const size_t res = CheckError(ZSTD_decompress(out, dsize, in.data(), in.size()), "decompress");
+
+ if (res != dsize) {
+ ythrow TDecompressError(dsize, res);
+ }
+ }
+
+ TStringBuf Name() const noexcept override {
+ return MyName;
+ }
+
+ const unsigned Level;
+ const TString MyName;
+ };
+
+ struct TZStd08Registrar {
+ TZStd08Registrar() {
+ for (int i = 1; i <= ZSTD_maxCLevel(); ++i) {
RegisterCodec(MakeHolder<TZStd08Codec>(i));
- RegisterAlias("zstd_" + ToString(i), "zstd08_" + ToString(i));
- }
- }
- };
+ RegisterAlias("zstd_" + ToString(i), "zstd08_" + ToString(i));
+ }
+ }
+ };
const TZStd08Registrar Registrar{};
-}
+}
diff --git a/library/cpp/blockcodecs/codecs_ut.cpp b/library/cpp/blockcodecs/codecs_ut.cpp
index bfe5a23690..10559e4c3f 100644
--- a/library/cpp/blockcodecs/codecs_ut.cpp
+++ b/library/cpp/blockcodecs/codecs_ut.cpp
@@ -4,7 +4,7 @@
#include <library/cpp/testing/unittest/registar.h>
#include <util/stream/str.h>
-#include <util/string/join.h>
+#include <util/string/join.h>
#include <util/digest/multi.h>
Y_UNIT_TEST_SUITE(TBlockCodecsTest) {
@@ -290,40 +290,40 @@ Y_UNIT_TEST_SUITE(TBlockCodecsTest) {
// restore status quo
SetMaxPossibleDecompressedLength(Max<size_t>());
}
-
- Y_UNIT_TEST(TestListAllCodecs) {
- static const TString ALL_CODECS =
- "brotli_1,brotli_10,brotli_11,brotli_2,brotli_3,brotli_4,brotli_5,brotli_6,brotli_7,brotli_8,brotli_9,"
-
- "bzip2,bzip2-1,bzip2-2,bzip2-3,bzip2-4,bzip2-5,bzip2-6,bzip2-7,bzip2-8,bzip2-9,"
-
- "fastlz,fastlz-0,fastlz-1,fastlz-2,"
-
- "lz4,lz4-fast-fast,lz4-fast-safe,lz4-fast10-fast,lz4-fast10-safe,lz4-fast11-fast,lz4-fast11-safe,"
- "lz4-fast12-fast,lz4-fast12-safe,lz4-fast13-fast,lz4-fast13-safe,lz4-fast14-fast,lz4-fast14-safe,"
- "lz4-fast15-fast,lz4-fast15-safe,lz4-fast16-fast,lz4-fast16-safe,lz4-fast17-fast,lz4-fast17-safe,"
- "lz4-fast18-fast,lz4-fast18-safe,lz4-fast19-fast,lz4-fast19-safe,lz4-fast20-fast,lz4-fast20-safe,"
- "lz4-hc-fast,lz4-hc-safe,lz4fast,lz4hc,"
-
- "lzma,lzma-0,lzma-1,lzma-2,lzma-3,lzma-4,lzma-5,lzma-6,lzma-7,lzma-8,lzma-9,"
-
- "null,"
-
- "snappy,"
-
- "zlib,zlib-0,zlib-1,zlib-2,zlib-3,zlib-4,zlib-5,zlib-6,zlib-7,zlib-8,zlib-9,"
-
- "zstd06_1,zstd06_10,zstd06_11,zstd06_12,zstd06_13,zstd06_14,zstd06_15,zstd06_16,zstd06_17,zstd06_18,"
- "zstd06_19,zstd06_2,zstd06_20,zstd06_21,zstd06_22,zstd06_3,zstd06_4,zstd06_5,zstd06_6,zstd06_7,zstd06_8,"
- "zstd06_9,"
-
- "zstd08_1,zstd08_10,zstd08_11,zstd08_12,zstd08_13,zstd08_14,zstd08_15,zstd08_16,zstd08_17,zstd08_18,"
- "zstd08_19,zstd08_2,zstd08_20,zstd08_21,zstd08_22,zstd08_3,zstd08_4,zstd08_5,zstd08_6,zstd08_7,zstd08_8,"
- "zstd08_9,zstd_1,zstd_10,zstd_11,zstd_12,zstd_13,zstd_14,zstd_15,zstd_16,zstd_17,zstd_18,zstd_19,zstd_2,"
- "zstd_20,zstd_21,zstd_22,zstd_3,zstd_4,zstd_5,zstd_6,zstd_7,zstd_8,zstd_9";
-
- UNIT_ASSERT_VALUES_EQUAL(ALL_CODECS, JoinSeq(",", ListAllCodecs()));
- }
+
+ Y_UNIT_TEST(TestListAllCodecs) {
+ static const TString ALL_CODECS =
+ "brotli_1,brotli_10,brotli_11,brotli_2,brotli_3,brotli_4,brotli_5,brotli_6,brotli_7,brotli_8,brotli_9,"
+
+ "bzip2,bzip2-1,bzip2-2,bzip2-3,bzip2-4,bzip2-5,bzip2-6,bzip2-7,bzip2-8,bzip2-9,"
+
+ "fastlz,fastlz-0,fastlz-1,fastlz-2,"
+
+ "lz4,lz4-fast-fast,lz4-fast-safe,lz4-fast10-fast,lz4-fast10-safe,lz4-fast11-fast,lz4-fast11-safe,"
+ "lz4-fast12-fast,lz4-fast12-safe,lz4-fast13-fast,lz4-fast13-safe,lz4-fast14-fast,lz4-fast14-safe,"
+ "lz4-fast15-fast,lz4-fast15-safe,lz4-fast16-fast,lz4-fast16-safe,lz4-fast17-fast,lz4-fast17-safe,"
+ "lz4-fast18-fast,lz4-fast18-safe,lz4-fast19-fast,lz4-fast19-safe,lz4-fast20-fast,lz4-fast20-safe,"
+ "lz4-hc-fast,lz4-hc-safe,lz4fast,lz4hc,"
+
+ "lzma,lzma-0,lzma-1,lzma-2,lzma-3,lzma-4,lzma-5,lzma-6,lzma-7,lzma-8,lzma-9,"
+
+ "null,"
+
+ "snappy,"
+
+ "zlib,zlib-0,zlib-1,zlib-2,zlib-3,zlib-4,zlib-5,zlib-6,zlib-7,zlib-8,zlib-9,"
+
+ "zstd06_1,zstd06_10,zstd06_11,zstd06_12,zstd06_13,zstd06_14,zstd06_15,zstd06_16,zstd06_17,zstd06_18,"
+ "zstd06_19,zstd06_2,zstd06_20,zstd06_21,zstd06_22,zstd06_3,zstd06_4,zstd06_5,zstd06_6,zstd06_7,zstd06_8,"
+ "zstd06_9,"
+
+ "zstd08_1,zstd08_10,zstd08_11,zstd08_12,zstd08_13,zstd08_14,zstd08_15,zstd08_16,zstd08_17,zstd08_18,"
+ "zstd08_19,zstd08_2,zstd08_20,zstd08_21,zstd08_22,zstd08_3,zstd08_4,zstd08_5,zstd08_6,zstd08_7,zstd08_8,"
+ "zstd08_9,zstd_1,zstd_10,zstd_11,zstd_12,zstd_13,zstd_14,zstd_15,zstd_16,zstd_17,zstd_18,zstd_19,zstd_2,"
+ "zstd_20,zstd_21,zstd_22,zstd_3,zstd_4,zstd_5,zstd_6,zstd_7,zstd_8,zstd_9";
+
+ UNIT_ASSERT_VALUES_EQUAL(ALL_CODECS, JoinSeq(",", ListAllCodecs()));
+ }
Y_UNIT_TEST(TestEncodeDecodeIntoString) {
TStringBuf data = "na gorshke sidel korol";
diff --git a/library/cpp/blockcodecs/core/codecs.cpp b/library/cpp/blockcodecs/core/codecs.cpp
index 21506e812b..d9eed9ca8f 100644
--- a/library/cpp/blockcodecs/core/codecs.cpp
+++ b/library/cpp/blockcodecs/core/codecs.cpp
@@ -1,6 +1,6 @@
#include "codecs.h"
#include "common.h"
-#include "register.h"
+#include "register.h"
#include <util/ysaveload.h>
#include <util/stream/null.h>
@@ -49,11 +49,11 @@ namespace {
Registry[codec->Name()] = codec;
}
- inline void Add(TCodecPtr codec) {
- Codecs.push_back(std::move(codec));
- Add(Codecs.back().Get());
- }
-
+ inline void Add(TCodecPtr codec) {
+ Codecs.push_back(std::move(codec));
+ Add(Codecs.back().Get());
+ }
+
inline void Alias(TStringBuf from, TStringBuf to) {
Tmp.emplace_back(from);
Registry[Tmp.back()] = Registry[to];
@@ -86,14 +86,14 @@ TString NBlockCodecs::ListAllCodecsAsString() {
return JoinSeq(TStringBuf(","), ListAllCodecs());
}
-void NBlockCodecs::RegisterCodec(TCodecPtr codec) {
- Singleton<TCodecFactory>()->Add(std::move(codec));
-}
-
-void NBlockCodecs::RegisterAlias(TStringBuf from, TStringBuf to) {
- Singleton<TCodecFactory>()->Alias(from, to);
-}
-
+void NBlockCodecs::RegisterCodec(TCodecPtr codec) {
+ Singleton<TCodecFactory>()->Add(std::move(codec));
+}
+
+void NBlockCodecs::RegisterAlias(TStringBuf from, TStringBuf to) {
+ Singleton<TCodecFactory>()->Alias(from, to);
+}
+
void NBlockCodecs::SetMaxPossibleDecompressedLength(size_t maxPossibleDecompressedLength) {
Singleton<TCodecFactory>()->MaxPossibleDecompressedLength = maxPossibleDecompressedLength;
}
diff --git a/library/cpp/blockcodecs/core/codecs.h b/library/cpp/blockcodecs/core/codecs.h
index 9c93c00274..2662759b9a 100644
--- a/library/cpp/blockcodecs/core/codecs.h
+++ b/library/cpp/blockcodecs/core/codecs.h
@@ -73,8 +73,8 @@ namespace NBlockCodecs {
size_t GetDecompressedLength(const TData& in) const;
};
- using TCodecPtr = THolder<ICodec>;
-
+ using TCodecPtr = THolder<ICodec>;
+
const ICodec* Codec(const TStringBuf& name);
// some aux methods
diff --git a/library/cpp/blockcodecs/core/register.h b/library/cpp/blockcodecs/core/register.h
index fa1186dd70..632a41e4a8 100644
--- a/library/cpp/blockcodecs/core/register.h
+++ b/library/cpp/blockcodecs/core/register.h
@@ -1,10 +1,10 @@
-#pragma once
-
-#include "codecs.h"
-
-namespace NBlockCodecs{
-
- void RegisterCodec(TCodecPtr codec);
- void RegisterAlias(TStringBuf from, TStringBuf to);
-
-}
+#pragma once
+
+#include "codecs.h"
+
+namespace NBlockCodecs{
+
+ void RegisterCodec(TCodecPtr codec);
+ void RegisterAlias(TStringBuf from, TStringBuf to);
+
+}
diff --git a/library/cpp/blockcodecs/stream.cpp b/library/cpp/blockcodecs/stream.cpp
index 65e61e9221..4ad6b2cb3f 100644
--- a/library/cpp/blockcodecs/stream.cpp
+++ b/library/cpp/blockcodecs/stream.cpp
@@ -1 +1 @@
-#include "stream.h"
+#include "stream.h"
diff --git a/library/cpp/blockcodecs/stream.h b/library/cpp/blockcodecs/stream.h
index 96c479cf7e..45aea32525 100644
--- a/library/cpp/blockcodecs/stream.h
+++ b/library/cpp/blockcodecs/stream.h
@@ -1,3 +1,3 @@
-#pragma once
-
+#pragma once
+
#include <library/cpp/blockcodecs/core/stream.h>
diff --git a/library/cpp/blockcodecs/ya.make b/library/cpp/blockcodecs/ya.make
index b8f03d5421..32c6d35c51 100644
--- a/library/cpp/blockcodecs/ya.make
+++ b/library/cpp/blockcodecs/ya.make
@@ -1,8 +1,8 @@
-LIBRARY()
-
-OWNER(pg)
-
-PEERDIR(
+LIBRARY()
+
+OWNER(pg)
+
+PEERDIR(
library/cpp/blockcodecs/core
library/cpp/blockcodecs/codecs/brotli
library/cpp/blockcodecs/codecs/bzip
@@ -13,14 +13,14 @@ PEERDIR(
library/cpp/blockcodecs/codecs/snappy
library/cpp/blockcodecs/codecs/zlib
library/cpp/blockcodecs/codecs/zstd
-)
-
-SRCS(
- codecs.cpp
- stream.cpp
-)
-
-END()
+)
+
+SRCS(
+ codecs.cpp
+ stream.cpp
+)
+
+END()
RECURSE_FOR_TESTS(
ut
diff --git a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.cpp b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.cpp
index 8883d7df07..98402ac53a 100644
--- a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.cpp
+++ b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.cpp
@@ -1 +1 @@
-#include "levenshtein_diff.h"
+#include "levenshtein_diff.h"
diff --git a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h
index 8a240bfed8..40d33ee048 100644
--- a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h
+++ b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h
@@ -8,7 +8,7 @@
#include <type_traits>
#include <utility>
-namespace NLevenshtein {
+namespace NLevenshtein {
enum EEditMoveType {
EMT_SPECIAL,
EMT_PRESERVE,
@@ -140,7 +140,7 @@ namespace NLevenshtein {
}
template <class TStringType>
- size_t Distance(const TStringType& str1, const TStringType& str2) {
+ size_t Distance(const TStringType& str1, const TStringType& str2) {
TEditChain editChain;
GetEditChain(str1, str2, editChain);
size_t result = 0;
@@ -169,7 +169,7 @@ namespace NLevenshtein {
{
}
};
-
+
template <class TStringType>
void GetStringReplacements(const TStringType& str1, const TStringType& str2, TVector<TReplacement>& res) {
TEditChain editChain;
diff --git a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp
index cf0f78637f..36ec9253cb 100644
--- a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp
+++ b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp
@@ -1,4 +1,4 @@
-#include "levenshtein_diff.h"
+#include "levenshtein_diff.h"
#include <library/cpp/testing/unittest/registar.h>
@@ -33,17 +33,17 @@ Y_UNIT_TEST_SUITE(Levenstein) {
Y_UNIT_TEST_SUITE(WeightedLevenstein) {
Y_UNIT_TEST(EqualStrings) {
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("12345"), TString("12345"), chain, &distance, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(TString("12345"), TString("12345"), chain, &distance, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(distance, 0.0f);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 5);
}
Y_UNIT_TEST(EmptyStrings) {
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString(""), TString(""), chain, &distance, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(TString(""), TString(""), chain, &distance, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(distance, 0.0f);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 0);
}
@@ -52,9 +52,9 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto unaryWeigher = [](const char&) {
return 2.0f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString(""), TString("12345"), chain, &distance, binaryZeroWeigher, unaryZeroWeigher, unaryWeigher);
+ NLevenshtein::GetEditChain(TString(""), TString("12345"), chain, &distance, binaryZeroWeigher, unaryZeroWeigher, unaryWeigher);
UNIT_ASSERT_VALUES_EQUAL(distance, 10.0f);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 5);
}
@@ -63,9 +63,9 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto unaryWeigher = [](const char&) {
return 3.0f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("54321"), TString(""), chain, &distance, binaryZeroWeigher, unaryWeigher, unaryZeroWeigher);
+ NLevenshtein::GetEditChain(TString("54321"), TString(""), chain, &distance, binaryZeroWeigher, unaryWeigher, unaryZeroWeigher);
UNIT_ASSERT_VALUES_EQUAL(distance, 15.0f);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 5);
}
@@ -76,20 +76,20 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
const float trgDistance = 2.0f;
const size_t trgChainLen = 5;
- NLevenshtein::TEditChain chainLeftRight;
+ NLevenshtein::TEditChain chainLeftRight;
float distanceLeftRight = 0.0f;
- NLevenshtein::GetEditChain(str1, str2, chainLeftRight, &distanceLeftRight, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(str1, str2, chainLeftRight, &distanceLeftRight, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(distanceLeftRight, trgDistance);
UNIT_ASSERT_VALUES_EQUAL(chainLeftRight.size(), trgChainLen);
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[0]), static_cast<int>(NLevenshtein::EMT_REPLACE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[1]), static_cast<int>(NLevenshtein::EMT_PRESERVE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[2]), static_cast<int>(NLevenshtein::EMT_PRESERVE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[3]), static_cast<int>(NLevenshtein::EMT_REPLACE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[4]), static_cast<int>(NLevenshtein::EMT_PRESERVE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[0]), static_cast<int>(NLevenshtein::EMT_REPLACE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[1]), static_cast<int>(NLevenshtein::EMT_PRESERVE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[2]), static_cast<int>(NLevenshtein::EMT_PRESERVE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[3]), static_cast<int>(NLevenshtein::EMT_REPLACE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chainLeftRight[4]), static_cast<int>(NLevenshtein::EMT_PRESERVE));
- NLevenshtein::TEditChain chainRightLeft;
+ NLevenshtein::TEditChain chainRightLeft;
float distanceRightLeft = 0.0f;
- NLevenshtein::GetEditChain(str2, str1, chainRightLeft, &distanceRightLeft, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(str2, str1, chainRightLeft, &distanceRightLeft, binaryMaxWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(distanceRightLeft, trgDistance);
UNIT_ASSERT_VALUES_EQUAL(chainRightLeft.size(), trgChainLen);
UNIT_ASSERT(chainRightLeft == chainLeftRight);
@@ -99,9 +99,9 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto binaryWeigher = [](const char&, const char&) {
return 0.0625f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("54321"), TString("43210"), chain, &distance, binaryWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(TString("54321"), TString("43210"), chain, &distance, binaryWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(distance, 0.3125f);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 5);
}
@@ -110,9 +110,9 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto unaryWeigher = [](const char&) {
return 0.0625f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("54321"), TString("98765"), chain, &distance, binaryMaxWeigher, unaryWeigher, unaryWeigher);
+ NLevenshtein::GetEditChain(TString("54321"), TString("98765"), chain, &distance, binaryMaxWeigher, unaryWeigher, unaryWeigher);
UNIT_ASSERT_VALUES_EQUAL(distance, 0.5f);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 9);
}
@@ -121,12 +121,12 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto unaryWeigher = [](const char& c) {
return c == 'x' ? 100.0f : 1.0f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("543x1"), TString("5431"), chain, &distance, binaryMaxWeigher, unaryWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(TString("543x1"), TString("5431"), chain, &distance, binaryMaxWeigher, unaryWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 5);
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[3]), static_cast<int>(NLevenshtein::EMT_REPLACE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[4]), static_cast<int>(NLevenshtein::EMT_DELETE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[3]), static_cast<int>(NLevenshtein::EMT_REPLACE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[4]), static_cast<int>(NLevenshtein::EMT_DELETE));
UNIT_ASSERT_VALUES_EQUAL(distance, 2.0f);
}
@@ -134,12 +134,12 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto unaryWeigher = [](const char& c) {
return c == 'x' ? 100.0f : 1.0f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("5431"), TString("543x1"), chain, &distance, binaryMaxWeigher, unaryMaxWeigher, unaryWeigher);
+ NLevenshtein::GetEditChain(TString("5431"), TString("543x1"), chain, &distance, binaryMaxWeigher, unaryMaxWeigher, unaryWeigher);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 5);
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[3]), static_cast<int>(NLevenshtein::EMT_REPLACE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[4]), static_cast<int>(NLevenshtein::EMT_INSERT));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[3]), static_cast<int>(NLevenshtein::EMT_REPLACE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[4]), static_cast<int>(NLevenshtein::EMT_INSERT));
UNIT_ASSERT_VALUES_EQUAL(distance, 2.0f);
}
@@ -147,12 +147,12 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto binaryWeigher = [](const char& l, const char&) {
return l == 'x' ? 100.0f : 1.0f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("5432x"), TString("5432y"), chain, &distance, binaryWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(TString("5432x"), TString("5432y"), chain, &distance, binaryWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 6);
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[4]), static_cast<int>(NLevenshtein::EMT_DELETE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[5]), static_cast<int>(NLevenshtein::EMT_INSERT));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[4]), static_cast<int>(NLevenshtein::EMT_DELETE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[5]), static_cast<int>(NLevenshtein::EMT_INSERT));
UNIT_ASSERT_VALUES_EQUAL(distance, 2.0f);
}
@@ -160,12 +160,12 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto binaryWeigher = [](const char&, const char& r) {
return r == 'x' ? 100.0f : 1.0f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("y4321"), TString("x4321"), chain, &distance, binaryWeigher, unaryMaxWeigher, unaryMaxWeigher);
+ NLevenshtein::GetEditChain(TString("y4321"), TString("x4321"), chain, &distance, binaryWeigher, unaryMaxWeigher, unaryMaxWeigher);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 6);
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[0]), static_cast<int>(NLevenshtein::EMT_DELETE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[1]), static_cast<int>(NLevenshtein::EMT_INSERT));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[0]), static_cast<int>(NLevenshtein::EMT_DELETE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[1]), static_cast<int>(NLevenshtein::EMT_INSERT));
UNIT_ASSERT_VALUES_EQUAL(distance, 2.0f);
}
@@ -179,12 +179,12 @@ Y_UNIT_TEST_SUITE(WeightedLevenstein) {
auto insertWeigher = [](const char&) {
return 0.9f;
};
- NLevenshtein::TEditChain chain;
+ NLevenshtein::TEditChain chain;
float distance = 0.0f;
- NLevenshtein::GetEditChain(TString("y0"), TString("0x"), chain, &distance, replaceWeigher, deleteWeigher, insertWeigher);
+ NLevenshtein::GetEditChain(TString("y0"), TString("0x"), chain, &distance, replaceWeigher, deleteWeigher, insertWeigher);
UNIT_ASSERT_VALUES_EQUAL(chain.size(), 2);
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[0]), static_cast<int>(NLevenshtein::EMT_REPLACE));
- UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[1]), static_cast<int>(NLevenshtein::EMT_REPLACE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[0]), static_cast<int>(NLevenshtein::EMT_REPLACE));
+ UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(chain[1]), static_cast<int>(NLevenshtein::EMT_REPLACE));
UNIT_ASSERT_VALUES_EQUAL(distance, 1.0f);
}
}
diff --git a/library/cpp/string_utils/levenshtein_diff/ut/ya.make b/library/cpp/string_utils/levenshtein_diff/ut/ya.make
index a3b9b8fea5..316ddabc89 100644
--- a/library/cpp/string_utils/levenshtein_diff/ut/ya.make
+++ b/library/cpp/string_utils/levenshtein_diff/ut/ya.make
@@ -1,9 +1,9 @@
-UNITTEST_FOR(library/cpp/string_utils/levenshtein_diff)
+UNITTEST_FOR(library/cpp/string_utils/levenshtein_diff)
OWNER(myltsev)
SRCS(
- levenshtein_diff_ut.cpp
+ levenshtein_diff_ut.cpp
)
END()
diff --git a/library/cpp/string_utils/levenshtein_diff/ya.make b/library/cpp/string_utils/levenshtein_diff/ya.make
index bafefe5365..531fd976b7 100644
--- a/library/cpp/string_utils/levenshtein_diff/ya.make
+++ b/library/cpp/string_utils/levenshtein_diff/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
OWNER(g:mt)
SRCS(
- levenshtein_diff.cpp
+ levenshtein_diff.cpp
)
PEERDIR(
diff --git a/library/cpp/string_utils/ya.make b/library/cpp/string_utils/ya.make
index cd731bda95..024bd766d3 100644
--- a/library/cpp/string_utils/ya.make
+++ b/library/cpp/string_utils/ya.make
@@ -12,8 +12,8 @@ RECURSE(
col_diff
col_diff/ut
indent_text
- levenshtein_diff
- levenshtein_diff/ut
+ levenshtein_diff
+ levenshtein_diff/ut
old_url_normalize
old_url_normalize/ut
parse_size
diff --git a/library/cpp/yson_pull/detail/lexer_base.h b/library/cpp/yson_pull/detail/lexer_base.h
index 572bdb3d18..8cf4d45f2a 100644
--- a/library/cpp/yson_pull/detail/lexer_base.h
+++ b/library/cpp/yson_pull/detail/lexer_base.h
@@ -55,7 +55,7 @@ namespace NYsonPull {
token_buffer_.clear();
auto type = number_type::int64;
while (true) {
- auto ch = this->Base::template get_byte<true>();
+ auto ch = this->Base::template get_byte<true>();
if (isdigit(ch) || ch == '+' || ch == '-') {
token_buffer_.push_back(ch);
} else if (ch == '.' || ch == 'e' || ch == 'E') {
@@ -106,7 +106,7 @@ namespace NYsonPull {
token_buffer_.clear();
auto& buf = Base::stream().buffer();
while (true) {
- this->Base::template fill_buffer<false>();
+ this->Base::template fill_buffer<false>();
auto* quote = reinterpret_cast<const ui8*>(
::memchr(buf.pos(), '"', buf.available()));
if (quote == nullptr) {
@@ -144,7 +144,7 @@ namespace NYsonPull {
TStringBuf read_unquoted_string() {
token_buffer_.clear();
while (true) {
- auto ch = this->Base::template get_byte<true>();
+ auto ch = this->Base::template get_byte<true>();
if (isalpha(ch) || isdigit(ch) ||
ch == '_' || ch == '-' || ch == '%' || ch == '.') {
token_buffer_.push_back(ch);
@@ -185,7 +185,7 @@ namespace NYsonPull {
auto needToRead = length;
token_buffer_.clear();
while (needToRead) {
- this->Base::template fill_buffer<false>();
+ this->Base::template fill_buffer<false>();
auto chunk_size = std::min(needToRead, buf.available());
token_buffer_.insert(
@@ -206,7 +206,7 @@ namespace NYsonPull {
auto assert_literal = [&](TStringBuf literal) -> void {
for (size_t i = 2; i < literal.size(); ++i) {
- token_buffer_.push_back(this->Base::template get_byte<false>());
+ token_buffer_.push_back(this->Base::template get_byte<false>());
Base::advance(1);
if (Y_UNLIKELY(token_buffer_.back() != literal[i])) {
throw_incorrect_percent_scalar();
@@ -215,7 +215,7 @@ namespace NYsonPull {
};
token_buffer_.clear();
- token_buffer_.push_back(this->Base::template get_byte<false>());
+ token_buffer_.push_back(this->Base::template get_byte<false>());
Base::advance(1);
switch (token_buffer_[0]) {
diff --git a/util/generic/vector.h b/util/generic/vector.h
index a5b258955a..3426252d3a 100644
--- a/util/generic/vector.h
+++ b/util/generic/vector.h
@@ -126,7 +126,7 @@ public:
inline void crop(size_type size) {
if (this->size() > size) {
- this->erase(this->begin() + size, this->end());
+ this->erase(this->begin() + size, this->end());
}
}
};
diff --git a/util/generic/vector_ut.cpp b/util/generic/vector_ut.cpp
index 0f6b4037a0..c23f719621 100644
--- a/util/generic/vector_ut.cpp
+++ b/util/generic/vector_ut.cpp
@@ -28,7 +28,7 @@ class TYVectorTest: public TTestBase {
//UNIT_TEST(TestEbo)
UNIT_TEST(TestFillInConstructor)
UNIT_TEST(TestYResize)
- UNIT_TEST(TestCrop)
+ UNIT_TEST(TestCrop)
UNIT_TEST(TestInitializeList)
UNIT_TEST_SUITE_END();
@@ -535,29 +535,29 @@ private:
}
}
- struct TNoDefaultConstructor {
- TNoDefaultConstructor() = delete;
+ struct TNoDefaultConstructor {
+ TNoDefaultConstructor() = delete;
explicit TNoDefaultConstructor(int val)
: Val(val)
{
}
-
- int Val;
- };
-
- void TestCrop() {
- TVector<TNoDefaultConstructor> vec;
- vec.emplace_back(42);
- vec.emplace_back(1337);
- vec.emplace_back(8888);
- vec.crop(1); // Should not require default constructor
- UNIT_ASSERT(vec.size() == 1);
- UNIT_ASSERT(vec[0].Val == 42);
+
+ int Val;
+ };
+
+ void TestCrop() {
+ TVector<TNoDefaultConstructor> vec;
+ vec.emplace_back(42);
+ vec.emplace_back(1337);
+ vec.emplace_back(8888);
+ vec.crop(1); // Should not require default constructor
+ UNIT_ASSERT(vec.size() == 1);
+ UNIT_ASSERT(vec[0].Val == 42);
vec.crop(50); // Does nothing if new size is greater than the current size()
UNIT_ASSERT(vec.size() == 1);
UNIT_ASSERT(vec[0].Val == 42);
- }
-
+ }
+
void TestYResize() {
TestYResize<int>();
TestYResize<TPod>();
diff --git a/util/system/atomic_win.h b/util/system/atomic_win.h
index 65c290e6cc..01a7cd230c 100644
--- a/util/system/atomic_win.h
+++ b/util/system/atomic_win.h
@@ -44,7 +44,7 @@ static inline bool AtomicCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
return _InterlockedCompareExchange((volatile long*)a, exchange, compare) == compare;
}
-static inline intptr_t AtomicGetAndCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
+static inline intptr_t AtomicGetAndCas(TAtomic* a, intptr_t exchange, intptr_t compare) {
return _InterlockedCompareExchange((volatile long*)a, exchange, compare);
}
diff --git a/util/system/fs.cpp b/util/system/fs.cpp
index d2611a8ccc..c2b1ee226b 100644
--- a/util/system/fs.cpp
+++ b/util/system/fs.cpp
@@ -122,7 +122,7 @@ TString NFs::ReadLink(const TString& path) {
while (true) {
ssize_t r = readlink(path.data(), buf.Data(), buf.Size());
if (r < 0) {
- ythrow yexception() << "can't read link " << path << ", errno = " << errno;
+ ythrow yexception() << "can't read link " << path << ", errno = " << errno;
}
if (r < (ssize_t)buf.Size()) {
return TString(buf.Data(), r);
diff --git a/ydb/library/yql/ast/yql_expr.h b/ydb/library/yql/ast/yql_expr.h
index d6eb544f9a..ffb7bc53e1 100644
--- a/ydb/library/yql/ast/yql_expr.h
+++ b/ydb/library/yql/ast/yql_expr.h
@@ -12,7 +12,7 @@
#include <ydb/library/yql/public/issue/yql_issue_manager.h>
#include <ydb/library/yql/public/udf/udf_data_type.h>
-#include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h>
+#include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h>
#include <library/cpp/enumbitset/enumbitset.h>
#include <library/cpp/containers/stack_vector/stack_vec.h>
#include <library/cpp/deprecated/enum_codegen/enum_codegen.h>
@@ -500,7 +500,7 @@ public:
TMaybe<TStringBuf> FindMistype(const TStringBuf& name) const {
for (const auto& item: Items) {
- if (NLevenshtein::Distance(name, item->GetName()) < DefaultMistypeDistance) {
+ if (NLevenshtein::Distance(name, item->GetName()) < DefaultMistypeDistance) {
return item->GetName();
}
}
diff --git a/ydb/library/yql/providers/common/config/ya.make b/ydb/library/yql/providers/common/config/ya.make
index 3211a5823b..afa5bef9b1 100644
--- a/ydb/library/yql/providers/common/config/ya.make
+++ b/ydb/library/yql/providers/common/config/ya.make
@@ -14,7 +14,7 @@ PEERDIR(
ydb/library/yql/ast
library/cpp/containers/sorted_vector
library/cpp/string_utils/parse_size
- library/cpp/string_utils/levenshtein_diff
+ library/cpp/string_utils/levenshtein_diff
)
diff --git a/ydb/library/yql/providers/common/config/yql_dispatch.cpp b/ydb/library/yql/providers/common/config/yql_dispatch.cpp
index 4e6df45a8f..146fa76058 100644
--- a/ydb/library/yql/providers/common/config/yql_dispatch.cpp
+++ b/ydb/library/yql/providers/common/config/yql_dispatch.cpp
@@ -4,7 +4,7 @@
#include <ydb/library/yql/core/yql_expr_type_annotation.h>
#include <ydb/library/yql/ast/yql_expr.h>
-#include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h>
+#include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h>
#include <util/string/split.h>
#include <util/random/random.h>
@@ -100,7 +100,7 @@ bool TSettingDispatcher::Dispatch(const TString& cluster, const TString& name, c
if (!ValidClusters.contains(cluster)) {
TStringBuilder nearClusterMsg;
for (auto& item: ValidClusters) {
- if (NLevenshtein::Distance(cluster, item) < DefaultMistypeDistance) {
+ if (NLevenshtein::Distance(cluster, item) < DefaultMistypeDistance) {
nearClusterMsg << ", did you mean " << item.Quote() << '?';
break;
}
@@ -136,7 +136,7 @@ bool TSettingDispatcher::Dispatch(const TString& cluster, const TString& name, c
TStringBuilder nearHandlerMsg;
for (auto& item: Handlers) {
- if (NLevenshtein::Distance(normalizedName, item.first) < DefaultMistypeDistance) {
+ if (NLevenshtein::Distance(normalizedName, item.first) < DefaultMistypeDistance) {
nearHandlerMsg << ", did you mean " << item.second->GetDisplayName().Quote() << '?';
break;
}
diff --git a/ydb/library/yql/sql/v0/node.h b/ydb/library/yql/sql/v0/node.h
index 4c7cfc273b..ef42aa3384 100644
--- a/ydb/library/yql/sql/v0/node.h
+++ b/ydb/library/yql/sql/v0/node.h
@@ -1023,7 +1023,7 @@ namespace NSQLTranslationV0 {
template<class TContainer>
TMaybe<TString> FindMistypeIn(const TContainer& container, const TString& name) {
for (auto& item: container) {
- if (NLevenshtein::Distance(name, item) < NYql::DefaultMistypeDistance) {
+ if (NLevenshtein::Distance(name, item) < NYql::DefaultMistypeDistance) {
return item;
}
}
diff --git a/ydb/library/yql/sql/v1/node.h b/ydb/library/yql/sql/v1/node.h
index de82b45a23..e9b9c25535 100644
--- a/ydb/library/yql/sql/v1/node.h
+++ b/ydb/library/yql/sql/v1/node.h
@@ -1346,7 +1346,7 @@ namespace NSQLTranslationV1 {
template<class TContainer>
TMaybe<TString> FindMistypeIn(const TContainer& container, const TString& name) {
for (auto& item: container) {
- if (NLevenshtein::Distance(name, item) < NYql::DefaultMistypeDistance) {
+ if (NLevenshtein::Distance(name, item) < NYql::DefaultMistypeDistance) {
return item;
}
}
diff --git a/ydb/library/yql/udfs/common/string/string_udf.cpp b/ydb/library/yql/udfs/common/string/string_udf.cpp
index c468215090..335ec644d0 100644
--- a/ydb/library/yql/udfs/common/string/string_udf.cpp
+++ b/ydb/library/yql/udfs/common/string/string_udf.cpp
@@ -6,7 +6,7 @@
#include <library/cpp/deprecated/split/split_iterator.h>
#include <library/cpp/html/pcdata/pcdata.h>
#include <library/cpp/string_utils/base64/base64.h>
-#include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h>
+#include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h>
#include <library/cpp/string_utils/quote/quote.h>
#include <util/charset/wide.h>
@@ -378,7 +378,7 @@ namespace {
Y_UNUSED(valueBuilder);
const TStringBuf left(args[0].AsStringRef());
const TStringBuf right(args[1].AsStringRef());
- const ui64 result = NLevenshtein::Distance(left, right);
+ const ui64 result = NLevenshtein::Distance(left, right);
return TUnboxedValuePod(result);
}
diff --git a/ydb/library/yql/udfs/common/string/ya.make b/ydb/library/yql/udfs/common/string/ya.make
index ca6da4e586..b781d069ec 100644
--- a/ydb/library/yql/udfs/common/string/ya.make
+++ b/ydb/library/yql/udfs/common/string/ya.make
@@ -17,7 +17,7 @@ PEERDIR(
library/cpp/deprecated/split
library/cpp/html/pcdata
library/cpp/string_utils/base64
- library/cpp/string_utils/levenshtein_diff
+ library/cpp/string_utils/levenshtein_diff
library/cpp/string_utils/quote
)