aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/charset
diff options
context:
space:
mode:
authorAlexander Fokin <apfokin@gmail.com>2022-02-10 16:45:38 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:38 +0300
commit863a59a65247c24db7cb06789bc5cf79d04da32f (patch)
tree139dc000c8cd4a40f5659e421b7c75135d080307 /library/cpp/charset
parentf64e95a9eb9ab03240599eb9581c5a9102426a96 (diff)
downloadydb-863a59a65247c24db7cb06789bc5cf79d04da32f.tar.gz
Restoring authorship annotation for Alexander Fokin <apfokin@gmail.com>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/charset')
-rw-r--r--library/cpp/charset/ci_string.h2
-rw-r--r--library/cpp/charset/codepage.cpp12
-rw-r--r--library/cpp/charset/wide.h32
-rw-r--r--library/cpp/charset/wide_ut.cpp2
4 files changed, 24 insertions, 24 deletions
diff --git a/library/cpp/charset/ci_string.h b/library/cpp/charset/ci_string.h
index edf24c1b6fe..0daa2587b35 100644
--- a/library/cpp/charset/ci_string.h
+++ b/library/cpp/charset/ci_string.h
@@ -62,7 +62,7 @@ public:
static int compare(const TCiString& s1, const char* p, const CodePage& cp = csYandex);
static int compare(const TStringBuf& p1, const TStringBuf& p2, const CodePage& cp = csYandex);
- // TODO: implement properly in TString via enum ECaseSensitivity
+ // TODO: implement properly in TString via enum ECaseSensitivity
static bool is_prefix(const TStringBuf& what, const TStringBuf& of, const CodePage& cp = csYandex);
static bool is_suffix(const TStringBuf& what, const TStringBuf& of, const CodePage& cp = csYandex);
diff --git a/library/cpp/charset/codepage.cpp b/library/cpp/charset/codepage.cpp
index 0431bef31bc..14bb9b328d0 100644
--- a/library/cpp/charset/codepage.cpp
+++ b/library/cpp/charset/codepage.cpp
@@ -14,7 +14,7 @@
#include <util/generic/hash_set.h>
#include <util/generic/singleton.h>
#include <util/generic/yexception.h>
-#include <util/memory/pool.h>
+#include <util/memory/pool.h>
#include <cstring>
@@ -131,7 +131,7 @@ private:
using TData = THashMap<TStringBuf, ECharset, ci_hash, ci_equal_to>;
TData Data;
- TMemoryPool Pool;
+ TMemoryPool Pool;
private:
inline void AddNameWithCheck(const TString& name, ECharset code) {
@@ -141,7 +141,7 @@ private:
Y_ASSERT(Data.find(name.c_str())->second == code);
}
}
-
+
inline void AddName(const TString& name, ECharset code) {
AddNameWithCheck(name, code);
@@ -160,9 +160,9 @@ private:
}
public:
- inline TCodePageHash()
- : Pool(20 * 1024) /* Currently used: 17KB. */
- {
+ inline TCodePageHash()
+ : Pool(20 * 1024) /* Currently used: 17KB. */
+ {
TString xPrefix = "x-";
const char* name;
diff --git a/library/cpp/charset/wide.h b/library/cpp/charset/wide.h
index 32d30e849e9..20d8beba482 100644
--- a/library/cpp/charset/wide.h
+++ b/library/cpp/charset/wide.h
@@ -56,30 +56,30 @@ namespace NDetail {
// Depending on template params, perform conversion of single-byte/multi-byte/utf8 string to/from wide string.
template <typename TCharType>
- inline TBasicStringBuf<TCharType> RecodeSingleByteChar(const TStringBuf src, TCharType* dst, const CodePage& cp) {
+ inline TBasicStringBuf<TCharType> RecodeSingleByteChar(const TStringBuf src, TCharType* dst, const CodePage& cp) {
Y_ASSERT(cp.SingleByteCodepage());
::CharToWide(src.data(), src.size(), dst, cp);
- return TBasicStringBuf<TCharType>(dst, src.size());
+ return TBasicStringBuf<TCharType>(dst, src.size());
}
template <typename TCharType>
- inline TStringBuf RecodeSingleByteChar(const TBasicStringBuf<TCharType> src, char* dst, const CodePage& cp) {
+ inline TStringBuf RecodeSingleByteChar(const TBasicStringBuf<TCharType> src, char* dst, const CodePage& cp) {
Y_ASSERT(cp.SingleByteCodepage());
::WideToChar(src.data(), src.size(), dst, cp.CPEnum);
return TStringBuf(dst, src.size());
}
template <typename TCharType>
- inline TBasicStringBuf<TCharType> RecodeMultiByteChar(const TStringBuf src, TCharType* dst, ECharset encoding) {
+ inline TBasicStringBuf<TCharType> RecodeMultiByteChar(const TStringBuf src, TCharType* dst, ECharset encoding) {
Y_ASSERT(!NCodepagePrivate::NativeCodepage(encoding));
size_t read = 0;
size_t written = 0;
::NICONVPrivate::RecodeToUnicode(encoding, src.data(), dst, src.size(), src.size(), read, written);
- return TBasicStringBuf<TCharType>(dst, written);
+ return TBasicStringBuf<TCharType>(dst, written);
}
template <typename TCharType>
- inline TStringBuf RecodeMultiByteChar(const TBasicStringBuf<TCharType> src, char* dst, ECharset encoding) {
+ inline TStringBuf RecodeMultiByteChar(const TBasicStringBuf<TCharType> src, char* dst, ECharset encoding) {
Y_ASSERT(!NCodepagePrivate::NativeCodepage(encoding));
size_t read = 0;
size_t written = 0;
@@ -88,15 +88,15 @@ namespace NDetail {
}
template <typename TCharType>
- inline TBasicStringBuf<TCharType> RecodeUtf8(const TStringBuf src, TCharType* dst) {
+ inline TBasicStringBuf<TCharType> RecodeUtf8(const TStringBuf src, TCharType* dst) {
size_t len = 0;
if (!::UTF8ToWide(src.data(), src.size(), dst, len))
ythrow yexception() << "Invalid UTF8: \"" << src.SubStr(0, 50) << (src.size() > 50 ? "...\"" : "\"");
- return TBasicStringBuf<TCharType>(dst, len);
+ return TBasicStringBuf<TCharType>(dst, len);
}
template <typename TCharType>
- inline TStringBuf RecodeUtf8(const TBasicStringBuf<TCharType> src, char* dst) {
+ inline TStringBuf RecodeUtf8(const TBasicStringBuf<TCharType> src, char* dst) {
size_t len = 0;
::WideToUTF8(src.data(), src.size(), dst, len);
return TStringBuf(dst, len);
@@ -105,7 +105,7 @@ namespace NDetail {
// Select one of re-coding methods from above, based on provided @encoding
template <typename TCharFrom, typename TCharTo>
- TBasicStringBuf<TCharTo> Recode(const TBasicStringBuf<TCharFrom> src, TCharTo* dst, ECharset encoding) {
+ TBasicStringBuf<TCharTo> Recode(const TBasicStringBuf<TCharFrom> src, TCharTo* dst, ECharset encoding) {
if (encoding == CODES_UTF8)
return RecodeUtf8(src, dst);
else if (SingleByteCodepage(encoding))
@@ -159,12 +159,12 @@ namespace NDetail {
// Main template interface for recoding in both directions
template <typename TCharFrom, typename TResult>
- typename TRecodeTraits<TCharFrom>::TStringBufTo Recode(const TBasicStringBuf<TCharFrom> src, TResult& dst, ECharset encoding) {
+ typename TRecodeTraits<TCharFrom>::TStringBufTo Recode(const TBasicStringBuf<TCharFrom> src, TResult& dst, ECharset encoding) {
using TCharTo = typename TRecodeTraits<TCharFrom>::TCharTo;
// make enough room for re-coded string
TCharTo* dstbuf = TRecodeResultOps<TResult>::Reserve(dst, src.size() * TRecodeTraits<TCharTo>::ReserveSize);
// do re-coding
- TBasicStringBuf<TCharTo> res = NBaseOps::Recode(src, dstbuf, encoding);
+ TBasicStringBuf<TCharTo> res = NBaseOps::Recode(src, dstbuf, encoding);
// truncate result back to proper size
TRecodeResultOps<TResult>::Truncate(dst, res.size());
return res;
@@ -172,14 +172,14 @@ namespace NDetail {
// appending version of Recode()
template <typename TCharFrom, typename TResult>
- typename TRecodeTraits<TCharFrom>::TStringBufTo RecodeAppend(const TBasicStringBuf<TCharFrom> src, TResult& dst, ECharset encoding) {
+ typename TRecodeTraits<TCharFrom>::TStringBufTo RecodeAppend(const TBasicStringBuf<TCharFrom> src, TResult& dst, ECharset encoding) {
using TCharTo = typename TRecodeTraits<TCharFrom>::TCharTo;
size_t dstOrigSize = TRecodeResultOps<TResult>::Size(dst);
TCharTo* dstbuf = TRecodeResultOps<TResult>::Reserve(dst, dstOrigSize + src.size() * TRecodeTraits<TCharTo>::ReserveSize);
- TBasicStringBuf<TCharTo> appended = NBaseOps::Recode(src, dstbuf + dstOrigSize, encoding);
+ TBasicStringBuf<TCharTo> appended = NBaseOps::Recode(src, dstbuf + dstOrigSize, encoding);
size_t dstFinalSize = dstOrigSize + appended.size();
TRecodeResultOps<TResult>::Truncate(dst, dstFinalSize);
- return TBasicStringBuf<TCharTo>(dstbuf, dstFinalSize);
+ return TBasicStringBuf<TCharTo>(dstbuf, dstFinalSize);
}
// special implementation for robust utf8 functions
@@ -198,7 +198,7 @@ namespace NDetail {
}
template <typename TCharFrom>
- inline typename TRecodeTraits<TCharFrom>::TStringTo Recode(const TBasicStringBuf<TCharFrom> src, ECharset encoding) {
+ inline typename TRecodeTraits<TCharFrom>::TStringTo Recode(const TBasicStringBuf<TCharFrom> src, ECharset encoding) {
typename TRecodeTraits<TCharFrom>::TStringTo res;
Recode<TCharFrom>(src, res, encoding);
return res;
diff --git a/library/cpp/charset/wide_ut.cpp b/library/cpp/charset/wide_ut.cpp
index 78947d51bad..8ecd78d7c92 100644
--- a/library/cpp/charset/wide_ut.cpp
+++ b/library/cpp/charset/wide_ut.cpp
@@ -156,7 +156,7 @@ UNIT_TEST_SUITE_REGISTRATION(TConversionTest);
do { \
/* convert char to wchar32 */ \
TTempBuf tmpbuf1(sbuf.length() * sizeof(wchar32)); \
- const TBasicStringBuf<wchar32> s4buf = NDetail::NBaseOps::Recode<char>(sbuf, reinterpret_cast<wchar32*>(tmpbuf1.Data()), enc); \
+ const TBasicStringBuf<wchar32> s4buf = NDetail::NBaseOps::Recode<char>(sbuf, reinterpret_cast<wchar32*>(tmpbuf1.Data()), enc); \
\
/* convert wchar32 to char */ \
TTempBuf tmpbuf2(s4buf.length() * 4); \