diff options
author | luchko <luchko@yandex-team.ru> | 2022-02-10 16:48:21 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:21 +0300 |
commit | 6400e9461eb46fbf792bb457abea992f9bb135c1 (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 | |
parent | 9f21dcc5d3d7c6e54e7adbaa2abaa6d86ae08c59 (diff) | |
download | ydb-6400e9461eb46fbf792bb457abea992f9bb135c1.tar.gz |
Restoring authorship annotation for <luchko@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | contrib/tools/python/pyconfig.inc | 14 | ||||
-rw-r--r-- | library/cpp/http/fetch/exthttpcodes.cpp | 12 | ||||
-rw-r--r-- | library/cpp/http/fetch/exthttpcodes.h | 4 | ||||
-rw-r--r-- | library/cpp/http/fetch/httpfsm.rl6 | 6 | ||||
-rw-r--r-- | library/cpp/http/fetch/httpheader.h | 10 | ||||
-rw-r--r-- | library/cpp/http/fetch/httpzreader.h | 6 | ||||
-rw-r--r-- | library/cpp/http/misc/httpdate.cpp | 4 | ||||
-rw-r--r-- | library/cpp/http/misc/httpdate.h | 2 | ||||
-rw-r--r-- | util/charset/wide.cpp | 6 | ||||
-rw-r--r-- | util/generic/bitmap.h | 66 | ||||
-rw-r--r-- | util/stream/output.cpp | 16 | ||||
-rw-r--r-- | util/stream/output.h | 6 |
12 files changed, 76 insertions, 76 deletions
diff --git a/contrib/tools/python/pyconfig.inc b/contrib/tools/python/pyconfig.inc index 92237a8521..01da7d4566 100644 --- a/contrib/tools/python/pyconfig.inc +++ b/contrib/tools/python/pyconfig.inc @@ -13,7 +13,7 @@ SET(PYTHON_FLAGS "-DPy_BUILD_CORE") ADDINCL(${PYTHON_SRC_DIR}/Include) CFLAGS( - -DUNQUOTED_VERSION=2.7 + -DUNQUOTED_VERSION=2.7 ) IF (NOT WIN32) @@ -23,18 +23,18 @@ IF (NOT WIN32) EXTRALIBS(-ldl) CFLAGS( - -DUNQUOTED_PYTHONPATH=:plat-linux2 - -DUNQUOTED_PLATFORM=linux2 + -DUNQUOTED_PYTHONPATH=:plat-linux2 + -DUNQUOTED_PLATFORM=linux2 ) ELSEIF (FREEBSD) CFLAGS( - -DUNQUOTED_PYTHONPATH=:plat-freebsd${FREEBSD_VER} - -DUNQUOTED_PLATFORM=freebsd${FREEBSD_VER} + -DUNQUOTED_PYTHONPATH=:plat-freebsd${FREEBSD_VER} + -DUNQUOTED_PLATFORM=freebsd${FREEBSD_VER} ) ELSEIF (DARWIN) CFLAGS( - -DUNQUOTED_PYTHONPATH=:plat-darwin - -DUNQUOTED_PLATFORM=darwin + -DUNQUOTED_PYTHONPATH=:plat-darwin + -DUNQUOTED_PLATFORM=darwin ) LDFLAGS( -framework SystemConfiguration diff --git a/library/cpp/http/fetch/exthttpcodes.cpp b/library/cpp/http/fetch/exthttpcodes.cpp index 225ff74242..acc05650c8 100644 --- a/library/cpp/http/fetch/exthttpcodes.cpp +++ b/library/cpp/http/fetch/exthttpcodes.cpp @@ -148,22 +148,22 @@ static ui16* prepare_flags(http_flag* arg) { http_flag* ptr; size_t i; - // устанавливаем значение по умолчанию для кодов не перечисленных в таблице выше + // устанавливаем значение по умолчанию для кодов не перечисленных в таблице выше for (i = 0; i < EXT_HTTP_CODE_MAX; ++i) flags[i] = CrazyServer; - // устанавливаем флаги для перечисленных кодов + // устанавливаем флаги для перечисленных кодов for (ptr = arg; ptr->http; ++ptr) flags[ptr->http & (EXT_HTTP_CODE_MAX - 1)] = ptr->flag; // для стандартных кодов ошибок берем флаги из первого кода каждой группы и проставляем их - // всем кодам не перечисленным в таблице выше + // всем кодам не перечисленным в таблице выше for (size_t group = 0; group < 1000; group += 100) for (size_t j = group + 1; j < group + 100; ++j) - flags[j] = flags[group]; + flags[j] = flags[group]; - // предыдущий цикл затер некоторые флаги перечисленные в таблице выше - // восстанавливаем их + // предыдущий цикл затер некоторые флаги перечисленные в таблице выше + // восстанавливаем их for (ptr = arg; ptr->http; ++ptr) flags[ptr->http & (EXT_HTTP_CODE_MAX - 1)] = ptr->flag; diff --git a/library/cpp/http/fetch/exthttpcodes.h b/library/cpp/http/fetch/exthttpcodes.h index f73069517e..6b525052cd 100644 --- a/library/cpp/http/fetch/exthttpcodes.h +++ b/library/cpp/http/fetch/exthttpcodes.h @@ -109,8 +109,8 @@ enum ExtHttpCodes { EXT_HTTP_FASTHOPS = 4000, EXT_HTTP_NODOC = 4001, - - EXT_HTTP_MAX + + EXT_HTTP_MAX }; enum HttpFlags { diff --git a/library/cpp/http/fetch/httpfsm.rl6 b/library/cpp/http/fetch/httpfsm.rl6 index 1bc15d3200..eab0328b18 100644 --- a/library/cpp/http/fetch/httpfsm.rl6 +++ b/library/cpp/http/fetch/httpfsm.rl6 @@ -154,18 +154,18 @@ action set_content_length { setguarded(base_hd->content_length, I); } content_length = "content-length"i def %beg_content_length int eoh %set_content_length; -################# content-range ################### +################# content-range ################### action beg_content_range_start { guard(base_hd->content_range_start); I = -1; } action set_content_range_start { setguarded(base_hd->content_range_start, I); } action beg_content_range_end { guard(base_hd->content_range_end); I = -1; } action set_content_range_end { setguarded(base_hd->content_range_end, I); } action beg_content_range_el { guard(base_hd->content_range_entity_length); I = -1; } action set_content_range_el { setguarded(base_hd->content_range_entity_length, I); } - + content_range = "content-range"i def "bytes"i sp %beg_content_range_start int '-' %set_content_range_start %beg_content_range_end int '/' %set_content_range_end %beg_content_range_el int eoh %set_content_range_el; - + ################# accept-ranges ################### action beg_accept_ranges { if (hd) { diff --git a/library/cpp/http/fetch/httpheader.h b/library/cpp/http/fetch/httpheader.h index b1718fecc7..b2810bbd41 100644 --- a/library/cpp/http/fetch/httpheader.h +++ b/library/cpp/http/fetch/httpheader.h @@ -79,7 +79,7 @@ public: public: void Init() { - error = 0; + error = 0; header_size = 0; entity_size = 0; content_length = -1; @@ -90,9 +90,9 @@ public: compression_method = HTTP_COMPRESSION_UNSET; transfer_chunked = -1; connection_closed = HTTP_CONNECTION_UNDEFINED; - content_range_start = -1; - content_range_end = -1; - content_range_entity_length = -1; + content_range_start = -1; + content_range_end = -1; + content_range_entity_length = -1; base.clear(); } @@ -153,7 +153,7 @@ public: retry_after = DEFAULT_RETRY_AFTER; x_robots_state = "xxxxx"; } - + void Print() const { THttpBaseHeader::Print(); printf("http_status: %" PRIi16 "\n", http_status); diff --git a/library/cpp/http/fetch/httpzreader.h b/library/cpp/http/fetch/httpzreader.h index 963fc27c75..68eb00853d 100644 --- a/library/cpp/http/fetch/httpzreader.h +++ b/library/cpp/http/fetch/httpzreader.h @@ -96,9 +96,9 @@ public: void* tmpin = Stream.next_in; long res = TBase::Read(tmpin); Stream.next_in = (Bytef*)tmpin; - if (res <= 0) - return res; - Stream.avail_in = (uInt)res; + if (res <= 0) + return res; + Stream.avail_in = (uInt)res; } Stream.next_out = Buf; diff --git a/library/cpp/http/misc/httpdate.cpp b/library/cpp/http/misc/httpdate.cpp index 04c1727adf..4a3031bbf4 100644 --- a/library/cpp/http/misc/httpdate.cpp +++ b/library/cpp/http/misc/httpdate.cpp @@ -54,11 +54,11 @@ int format_http_date(char buf[], size_t size, time_t when) { GmTimeR(&when, &tms); #ifndef HTTP_DATE_ISO_8601 - return snprintf(buf, size, "%s, %02d %s %04d %02d:%02d:%02d GMT", + return snprintf(buf, size, "%s, %02d %s %04d %02d:%02d:%02d GMT", wkdays[tms.tm_wday], tms.tm_mday, months[tms.tm_mon], tms.tm_year + 1900, tms.tm_hour, tms.tm_min, tms.tm_sec); #else /* ISO 8601 */ - return snprintf(buf, size, "%04d%02d%02dT%02d%02d%02d+0000", + return snprintf(buf, size, "%04d%02d%02dT%02d%02d%02d+0000", tms.tm_year + 1900, tms.tm_mon + 1, tms.tm_mday, tms.tm_hour, tms.tm_min, tms.tm_sec); #endif diff --git a/library/cpp/http/misc/httpdate.h b/library/cpp/http/misc/httpdate.h index 20915151bf..04876f38fe 100644 --- a/library/cpp/http/misc/httpdate.h +++ b/library/cpp/http/misc/httpdate.h @@ -15,7 +15,7 @@ inline time_t parse_http_date(const TStringBuf& datestring) { } } -int format_http_date(char buf[], size_t size, time_t when); +int format_http_date(char buf[], size_t size, time_t when); char* format_http_date(time_t when, char* buf, size_t len); TString FormatHttpDate(time_t when); diff --git a/util/charset/wide.cpp b/util/charset/wide.cpp index e193cb495b..a287438ddd 100644 --- a/util/charset/wide.cpp +++ b/util/charset/wide.cpp @@ -602,9 +602,9 @@ void EscapeHtmlChars(TUtf16String& str) { case '&': ent = & break; - case '\"': - ent = " - break; + case '\"': + ent = " + break; default: if (insertBr && (cs[i] == '\r' || cs[i] == '\n')) { ent = &br; diff --git a/util/generic/bitmap.h b/util/generic/bitmap.h index 99096bc048..f77d182460 100644 --- a/util/generic/bitmap.h +++ b/util/generic/bitmap.h @@ -10,8 +10,8 @@ #include <util/system/yassert.h> #include <util/system/defaults.h> #include <util/str_stl.h> -#include <util/ysaveload.h> - +#include <util/ysaveload.h> + namespace NBitMapPrivate { // Returns number of bits set; result is in most significatnt byte inline ui64 ByteSums(ui64 x) { @@ -275,7 +275,7 @@ namespace NBitMapPrivate { } return true; } - + Y_FORCE_INLINE bool ExpandBitSize(size_t bitSize, bool keepData = true) { return ExpandSize((bitSize + 8 * sizeof(TChunk) - 1) / (8 * sizeof(TChunk)), keepData); } @@ -509,7 +509,7 @@ public: } Y_FORCE_INLINE TReference operator[](size_t pos) { - const bool fitStorage = Mask.ExpandBitSize(pos + 1); + const bool fitStorage = Mask.ExpandBitSize(pos + 1); Y_ASSERT(fitStorage); return TReference(&Mask.Data[pos >> DivCount], ModMask & pos); } @@ -519,7 +519,7 @@ public: } Y_FORCE_INLINE TThis& Set(size_t pos) { - const bool fitStorage = Mask.ExpandBitSize(pos + 1); + const bool fitStorage = Mask.ExpandBitSize(pos + 1); Y_ASSERT(fitStorage); Mask.Data[pos >> DivCount] |= static_cast<TChunk>(1) << (pos & ModMask); return *this; @@ -552,7 +552,7 @@ public: } Y_FORCE_INLINE TThis& Flip(size_t pos) { - const bool fitStorage = Mask.ExpandBitSize(pos + 1); + const bool fitStorage = Mask.ExpandBitSize(pos + 1); Y_ASSERT(fitStorage); Mask.Data[pos >> DivCount] ^= static_cast<TChunk>(1) << (pos & ModMask); return *this; @@ -617,8 +617,8 @@ public: Y_FORCE_INLINE void Reserve(size_t bitCount) { Y_VERIFY(Mask.ExpandBitSize(bitCount), "Exceeding bitmap storage capacity"); - } - + } + Y_FORCE_INLINE size_t ValueBitCount() const { size_t nonZeroChunk = Mask.GetChunkCapacity() - 1; while (nonZeroChunk != 0 && !Mask.Data[nonZeroChunk]) @@ -722,7 +722,7 @@ public: } TThis& Xor(const TThis& bitmap) { - Reserve(bitmap.Size()); + Reserve(bitmap.Size()); for (size_t i = 0; i < bitmap.Mask.GetChunkCapacity(); ++i) Mask.Data[i] ^= bitmap.Mask.Data[i]; return *this; @@ -957,34 +957,34 @@ public: count += ::NBitMapPrivate::CountBitsPrivate(Mask.Data[i]); return count; } - + void Save(IOutputStream* out) const { - ::Save(out, ui8(sizeof(TChunk))); - ::Save(out, ui64(Size())); - ::SavePodArray(out, Mask.Data, Mask.GetChunkCapacity()); - } - + ::Save(out, ui8(sizeof(TChunk))); + ::Save(out, ui64(Size())); + ::SavePodArray(out, Mask.Data, Mask.GetChunkCapacity()); + } + void Load(IInputStream* inp) { - ui8 chunkSize = 0; - ::Load(inp, chunkSize); + ui8 chunkSize = 0; + ::Load(inp, chunkSize); Y_VERIFY(size_t(chunkSize) == sizeof(TChunk), "Chunk size is not the same"); - - ui64 bitCount64 = 0; - ::Load(inp, bitCount64); - size_t bitCount = size_t(bitCount64); - Reserve(bitCount); - - size_t chunkCount = 0; - if (bitCount > 0) { - chunkCount = ((bitCount - 1) >> DivCount) + 1; - ::LoadPodArray(inp, Mask.Data, chunkCount); - } - - if (chunkCount < Mask.GetChunkCapacity()) { - ::memset(Mask.Data + chunkCount, 0, (Mask.GetChunkCapacity() - chunkCount) * sizeof(TChunk)); - } + + ui64 bitCount64 = 0; + ::Load(inp, bitCount64); + size_t bitCount = size_t(bitCount64); + Reserve(bitCount); + + size_t chunkCount = 0; + if (bitCount > 0) { + chunkCount = ((bitCount - 1) >> DivCount) + 1; + ::LoadPodArray(inp, Mask.Data, chunkCount); + } + + if (chunkCount < Mask.GetChunkCapacity()) { + ::memset(Mask.Data + chunkCount, 0, (Mask.GetChunkCapacity() - chunkCount) * sizeof(TChunk)); + } Mask.Sanitize(); - } + } inline size_t Hash() const { THash<TChunk> chunkHasher; diff --git a/util/stream/output.cpp b/util/stream/output.cpp index 6598603d25..db81b81b70 100644 --- a/util/stream/output.cpp +++ b/util/stream/output.cpp @@ -210,7 +210,7 @@ void Out<typename std::vector<bool>::reference>(IOutputStream& o, const std::vec #endif #ifndef TSTRING_IS_STD_STRING -template <> +template <> void Out<TBasicCharRef<TString>>(IOutputStream& o, const TBasicCharRef<TString>& c) { o << static_cast<char>(c); } @@ -228,14 +228,14 @@ void Out<TBasicCharRef<TUtf32String>>(IOutputStream& o, const TBasicCharRef<TUtf template <> void Out<const void*>(IOutputStream& o, const void* t) { - o << Hex(size_t(t)); -} - -template <> + o << Hex(size_t(t)); +} + +template <> void Out<void*>(IOutputStream& o, void* t) { - Out<const void*>(o, t); -} - + Out<const void*>(o, t); +} + using TNullPtr = decltype(nullptr); template <> diff --git a/util/stream/output.h b/util/stream/output.h index a1eeda2a20..00eef50b95 100644 --- a/util/stream/output.h +++ b/util/stream/output.h @@ -290,9 +290,9 @@ static inline void Endl(IOutputStream& o) { * Flushing stream manipulator, basically the same as `std::flush`. */ static inline void Flush(IOutputStream& o) { - o.Flush(); -} - + o.Flush(); +} + /* * Also see format.h for additional manipulators. */ |