diff options
author | agorodilov <agorodilov@yandex-team.ru> | 2022-02-10 16:47:09 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:09 +0300 |
commit | 7a4979e6211c3e78c7f9041d4a9e5d3405343c36 (patch) | |
tree | 9e9943579e5a14679af7cd2cda3c36d8c0b775d3 /util/stream | |
parent | 676340c42e269f3070f194d160f42a83a10568d4 (diff) | |
download | ydb-7a4979e6211c3e78c7f9041d4a9e5d3405343c36.tar.gz |
Restoring authorship annotation for <agorodilov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/stream')
36 files changed, 111 insertions, 111 deletions
diff --git a/util/stream/aligned.h b/util/stream/aligned.h index 70e7be05a9..81203f71e3 100644 --- a/util/stream/aligned.h +++ b/util/stream/aligned.h @@ -42,8 +42,8 @@ public: } private: - size_t DoRead(void* ptr, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* ptr, size_t len) override; + size_t DoSkip(size_t len) override; size_t DoReadTo(TString& st, char ch) override; ui64 DoReadAll(IOutputStream& out) override; @@ -89,7 +89,7 @@ public: } private: - void DoWrite(const void* ptr, size_t len) override; + void DoWrite(const void* ptr, size_t len) override; private: IOutputStream* Stream_; diff --git a/util/stream/aligned_ut.cpp b/util/stream/aligned_ut.cpp index e980d05cf7..8ff512fc7c 100644 --- a/util/stream/aligned_ut.cpp +++ b/util/stream/aligned_ut.cpp @@ -10,7 +10,7 @@ public: } protected: - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { if (len == 0) { return 0; } @@ -20,7 +20,7 @@ protected: return 1; } - size_t DoSkip(size_t len) override { + size_t DoSkip(size_t len) override { if (len == 0) { return 0; } diff --git a/util/stream/buffer.cpp b/util/stream/buffer.cpp index 2facece4ea..e3ecbacb03 100644 --- a/util/stream/buffer.cpp +++ b/util/stream/buffer.cpp @@ -9,7 +9,7 @@ public: { } - virtual ~TImpl() = default; + virtual ~TImpl() = default; inline size_t DoNext(void** ptr) { if (Data_.Avail() == 0) { @@ -69,7 +69,7 @@ TBufferOutput::TBufferOutput(TBuffer& buffer) TBufferOutput::TBufferOutput(TBufferOutput&&) noexcept = default; TBufferOutput& TBufferOutput::operator=(TBufferOutput&&) noexcept = default; -TBufferOutput::~TBufferOutput() = default; +TBufferOutput::~TBufferOutput() = default; TBuffer& TBufferOutput::Buffer() const noexcept { return Impl_->Buffer(); @@ -97,7 +97,7 @@ TBufferInput::TBufferInput(const TBuffer& buffer) { } -TBufferInput::~TBufferInput() = default; +TBufferInput::~TBufferInput() = default; const TBuffer& TBufferInput::Buffer() const noexcept { return Buf_; diff --git a/util/stream/buffer.h b/util/stream/buffer.h index 9dc99dbe49..68cd7af4e0 100644 --- a/util/stream/buffer.h +++ b/util/stream/buffer.h @@ -48,7 +48,7 @@ public: private: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; void DoWriteC(char c) override; private: @@ -76,7 +76,7 @@ public: void Rewind() noexcept; protected: - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; void DoUndo(size_t len) override; private: @@ -111,7 +111,7 @@ public: { } - ~TBufferStream() override = default; + ~TBufferStream() override = default; using TBufferOutput::Buffer; }; diff --git a/util/stream/buffered.cpp b/util/stream/buffered.cpp index a00e592e1c..6a2e72fd76 100644 --- a/util/stream/buffered.cpp +++ b/util/stream/buffered.cpp @@ -13,7 +13,7 @@ public: { } - inline ~TImpl() = default; + inline ~TImpl() = default; inline size_t Next(const void** ptr, size_t len) { if (MemInput_.Exhausted()) { @@ -125,7 +125,7 @@ TBufferedInput::TBufferedInput(IInputStream* slave, size_t buflen) TBufferedInput::TBufferedInput(TBufferedInput&&) noexcept = default; TBufferedInput& TBufferedInput::operator=(TBufferedInput&&) noexcept = default; -TBufferedInput::~TBufferedInput() = default; +TBufferedInput::~TBufferedInput() = default; size_t TBufferedInput::DoRead(void* buf, size_t len) { return Impl_->Read(buf, len); @@ -157,7 +157,7 @@ public: { } - virtual ~TImpl() = default; + virtual ~TImpl() = default; inline void Reset() { MemOut_.Reset(Buf(), Len()); @@ -296,9 +296,9 @@ namespace { Reset(); } - ~TSimpleImpl() override = default; + ~TSimpleImpl() override = default; - void OnBufferExhausted() final { + void OnBufferExhausted() final { } void* Buf() const noexcept override { @@ -323,9 +323,9 @@ namespace { Reset(); } - ~TAdaptiveImpl() override = default; + ~TAdaptiveImpl() override = default; - void OnBufferExhausted() final { + void OnBufferExhausted() final { const size_t c = ((size_t)Step) << Min<size_t>(++N_ / 32, 10); if (c > B_.Capacity()) { @@ -418,11 +418,11 @@ TBufferedOutput::TBufferedOutput(IOutputStream* slave, size_t buflen) { } -TBufferedOutput::~TBufferedOutput() = default; +TBufferedOutput::~TBufferedOutput() = default; TAdaptiveBufferedOutput::TAdaptiveBufferedOutput(IOutputStream* slave) : TBufferedOutputBase(slave) { } -TAdaptiveBufferedOutput::~TAdaptiveBufferedOutput() = default; +TAdaptiveBufferedOutput::~TAdaptiveBufferedOutput() = default; diff --git a/util/stream/buffered.h b/util/stream/buffered.h index 0847186141..005f482979 100644 --- a/util/stream/buffered.h +++ b/util/stream/buffered.h @@ -38,10 +38,10 @@ public: void Reset(IInputStream* slave); protected: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; size_t DoReadTo(TString& st, char ch) override; - size_t DoSkip(size_t len) override; - size_t DoNext(const void** ptr, size_t len) override; + size_t DoSkip(size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; private: class TImpl; @@ -113,10 +113,10 @@ public: protected: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* data, size_t len) override; + void DoWrite(const void* data, size_t len) override; void DoWriteC(char c) override; - void DoFlush() override; - void DoFinish() override; + void DoFlush() override; + void DoFinish() override; private: THolder<TImpl> Impl_; diff --git a/util/stream/debug.h b/util/stream/debug.h index 92d6d4b42d..0407cd6a73 100644 --- a/util/stream/debug.h +++ b/util/stream/debug.h @@ -13,13 +13,13 @@ class TDebugOutput: public IOutputStream { public: inline TDebugOutput() noexcept = default; - ~TDebugOutput() override = default; + ~TDebugOutput() override = default; TDebugOutput(TDebugOutput&&) noexcept = default; TDebugOutput& operator=(TDebugOutput&&) noexcept = default; private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; /** diff --git a/util/stream/direct_io.h b/util/stream/direct_io.h index 2e1f2e07dd..53130e7a12 100644 --- a/util/stream/direct_io.h +++ b/util/stream/direct_io.h @@ -9,8 +9,8 @@ public: TRandomAccessFileInput(TDirectIOBufferedFile& file, ui64 position); protected: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; private: TDirectIOBufferedFile& File; @@ -28,8 +28,8 @@ protected: TDirectIOBufferedFile* File; private: - void DoWrite(const void* buf, size_t len) override; - void DoFlush() override; + void DoWrite(const void* buf, size_t len) override; + void DoFlush() override; }; class TBufferedFileOutputEx: public TRandomAccessFileOutput { @@ -37,7 +37,7 @@ public: TBufferedFileOutputEx(const TString& path, EOpenMode oMode, size_t buflen = 1 << 17); private: - void DoFlush() override; - void DoFinish() override; + void DoFlush() override; + void DoFinish() override; THolder<TDirectIOBufferedFile> FileHolder; }; diff --git a/util/stream/file.cpp b/util/stream/file.cpp index dc5d2f6311..3cae1fbaac 100644 --- a/util/stream/file.cpp +++ b/util/stream/file.cpp @@ -77,7 +77,7 @@ public: { } - inline ~TImpl() = default; + inline ~TImpl() = default; }; TMappedFileInput::TMappedFileInput(const TFile& file) @@ -94,4 +94,4 @@ TMappedFileInput::TMappedFileInput(const TString& path) Reset(Impl_->Data(), Impl_->Size()); } -TMappedFileInput::~TMappedFileInput() = default; +TMappedFileInput::~TMappedFileInput() = default; diff --git a/util/stream/file.h b/util/stream/file.h index c1cf4f591d..ec4d91a2b1 100644 --- a/util/stream/file.h +++ b/util/stream/file.h @@ -26,8 +26,8 @@ public: TUnbufferedFileInput(const TString& path); private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; private: TFile File_; @@ -63,8 +63,8 @@ public: TUnbufferedFileOutput& operator=(TUnbufferedFileOutput&&) noexcept = default; private: - void DoWrite(const void* buf, size_t len) override; - void DoFlush() override; + void DoWrite(const void* buf, size_t len) override; + void DoFlush() override; private: TFile File_; diff --git a/util/stream/format_ut.cpp b/util/stream/format_ut.cpp index 43245aeb48..22fd3d71f9 100644 --- a/util/stream/format_ut.cpp +++ b/util/stream/format_ut.cpp @@ -61,15 +61,15 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { } Y_UNIT_TEST(TestBin) { - UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(2), nullptr)), "10"); - UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2), nullptr)), "-10"); + UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(2), nullptr)), "10"); + UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2), nullptr)), "-10"); UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2))), "-0b00000000000000000000000000000010"); UNIT_ASSERT_VALUES_EQUAL(ToString(SBin(static_cast<i32>(-2), HF_FULL)), "-00000000000000000000000000000010"); - UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(15), nullptr)), "1111"); + UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(15), nullptr)), "1111"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(1))), "0b00000000000000000000000000000001"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(-1))), "0b11111111111111111111111111111111"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<i32>(-1))), "0b11111111111111111111111111111111"); - UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<i32>(-1), nullptr)), "11111111111111111111111111111111"); + UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<i32>(-1), nullptr)), "11111111111111111111111111111111"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(256))), "0b00000000000000000000000100000000"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui8>(16))), "0b00010000"); UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui64>(1234587912357ull))), "0b0000000000000000000000010001111101110011001011001000100010100101"); diff --git a/util/stream/input.cpp b/util/stream/input.cpp index 6e8170f2f9..5877d2a910 100644 --- a/util/stream/input.cpp +++ b/util/stream/input.cpp @@ -164,9 +164,9 @@ ui64 TransferData(IInputStream* in, IOutputStream* out) { namespace { struct TStdIn: public IInputStream { - ~TStdIn() override = default; + ~TStdIn() override = default; - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { const size_t ret = fread(buf, 1, len, F_); if (ret < len && ferror(F_)) { diff --git a/util/stream/input_ut.cpp b/util/stream/input_ut.cpp index 4a93f5458e..c78b1e244e 100644 --- a/util/stream/input_ut.cpp +++ b/util/stream/input_ut.cpp @@ -49,7 +49,7 @@ public: } protected: - size_t DoRead(void*, size_t len) override { + size_t DoRead(void*, size_t len) override { len = Min(static_cast<ui64>(len), Size_); Size_ -= len; return len; @@ -64,7 +64,7 @@ public: TNoOutput() = default; protected: - void DoWrite(const void*, size_t) override { + void DoWrite(const void*, size_t) override { } }; @@ -76,7 +76,7 @@ public: } protected: - size_t DoRead(void* buf, size_t len) override { + size_t DoRead(void* buf, size_t len) override { Y_ASSERT(len != 0); if (String_.empty()) { diff --git a/util/stream/ios_ut.cpp b/util/stream/ios_ut.cpp index 139f4296e5..cfb4ccb860 100644 --- a/util/stream/ios_ut.cpp +++ b/util/stream/ios_ut.cpp @@ -177,14 +177,14 @@ public: { } - ~TMyStringOutput() override = default; + ~TMyStringOutput() override = default; - void DoWrite(const void* data, size_t len) override { + void DoWrite(const void* data, size_t len) override { S_.Write(data, len); UNIT_ASSERT(len < BufLen_ || ((len % BufLen_) == 0)); } - void DoWriteV(const TPart* p, size_t count) override { + void DoWriteV(const TPart* p, size_t count) override { TString s; for (size_t i = 0; i < count; ++i) { diff --git a/util/stream/length.h b/util/stream/length.h index 4d508ae24d..2e2d71db93 100644 --- a/util/stream/length.h +++ b/util/stream/length.h @@ -20,15 +20,15 @@ public: { } - ~TLengthLimitedInput() override = default; + ~TLengthLimitedInput() override = default; inline ui64 Left() const noexcept { return Length_; } private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; private: IInputStream* Slave_; @@ -46,7 +46,7 @@ public: { } - ~TCountingInput() override = default; + ~TCountingInput() override = default; /** * \returns The total number of characters read from @@ -57,8 +57,8 @@ public: } private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; size_t DoReadTo(TString& st, char ch) override; ui64 DoReadAll(IOutputStream& out) override; @@ -78,7 +78,7 @@ public: { } - ~TCountingOutput() override = default; + ~TCountingOutput() override = default; TCountingOutput(TCountingOutput&&) noexcept = default; TCountingOutput& operator=(TCountingOutput&&) noexcept = default; @@ -92,7 +92,7 @@ public: } private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; private: IOutputStream* Slave_; diff --git a/util/stream/mem.cpp b/util/stream/mem.cpp index 22a3339e27..964a475788 100644 --- a/util/stream/mem.cpp +++ b/util/stream/mem.cpp @@ -20,7 +20,7 @@ TMemoryInput::TMemoryInput(const TStringBuf buf) noexcept { } -TMemoryInput::~TMemoryInput() = default; +TMemoryInput::~TMemoryInput() = default; size_t TMemoryInput::DoNext(const void** ptr, size_t len) { len = Min(Len_, len); @@ -36,7 +36,7 @@ void TMemoryInput::DoUndo(size_t len) { Buf_ -= len; } -TMemoryOutput::~TMemoryOutput() = default; +TMemoryOutput::~TMemoryOutput() = default; size_t TMemoryOutput::DoNext(void** ptr) { Y_ENSURE(Buf_ < End_, TStringBuf("memory output stream exhausted")); diff --git a/util/stream/mem.h b/util/stream/mem.h index 18a5d46772..aa93f26561 100644 --- a/util/stream/mem.h +++ b/util/stream/mem.h @@ -97,7 +97,7 @@ public: } private: - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; void DoUndo(size_t len) override; private: @@ -176,7 +176,7 @@ public: private: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; void DoWriteC(char c) override; protected: diff --git a/util/stream/multi.cpp b/util/stream/multi.cpp index b2354298a0..2f9b247cb2 100644 --- a/util/stream/multi.cpp +++ b/util/stream/multi.cpp @@ -7,7 +7,7 @@ TMultiInput::TMultiInput(IInputStream* f, IInputStream* s) noexcept { } -TMultiInput::~TMultiInput() = default; +TMultiInput::~TMultiInput() = default; size_t TMultiInput::DoRead(void* buf, size_t len) { const size_t ret = C_->Read(buf, len); diff --git a/util/stream/multi.h b/util/stream/multi.h index 8bfd462d99..03e7a1e5c7 100644 --- a/util/stream/multi.h +++ b/util/stream/multi.h @@ -16,8 +16,8 @@ public: ~TMultiInput() override; private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; size_t DoReadTo(TString& st, char ch) override; private: diff --git a/util/stream/null.cpp b/util/stream/null.cpp index 4e8b298145..59a62d9a29 100644 --- a/util/stream/null.cpp +++ b/util/stream/null.cpp @@ -9,7 +9,7 @@ TNullIO& NPrivate::StdNullStream() noexcept { TNullInput::TNullInput() noexcept { } -TNullInput::~TNullInput() = default; +TNullInput::~TNullInput() = default; size_t TNullInput::DoRead(void*, size_t) { return 0; @@ -25,7 +25,7 @@ size_t TNullInput::DoNext(const void**, size_t) { TNullOutput::TNullOutput() noexcept = default; -TNullOutput::~TNullOutput() = default; +TNullOutput::~TNullOutput() = default; void TNullOutput::DoWrite(const void* /*buf*/, size_t /*len*/) { } @@ -33,4 +33,4 @@ void TNullOutput::DoWrite(const void* /*buf*/, size_t /*len*/) { TNullIO::TNullIO() noexcept { } -TNullIO::~TNullIO() = default; +TNullIO::~TNullIO() = default; diff --git a/util/stream/null.h b/util/stream/null.h index 8c335a9a78..41f831c9ca 100644 --- a/util/stream/null.h +++ b/util/stream/null.h @@ -17,9 +17,9 @@ public: ~TNullInput() override; private: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; - size_t DoNext(const void** ptr, size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; }; /** @@ -34,7 +34,7 @@ public: TNullOutput& operator=(TNullOutput&&) noexcept = default; private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; /** diff --git a/util/stream/output.cpp b/util/stream/output.cpp index db81b81b70..77ac3e62e9 100644 --- a/util/stream/output.cpp +++ b/util/stream/output.cpp @@ -346,10 +346,10 @@ namespace { { } - ~TStdOutput() override = default; + ~TStdOutput() override = default; private: - void DoWrite(const void* buf, size_t len) override { + void DoWrite(const void* buf, size_t len) override { if (len != fwrite(buf, 1, len, F_)) { #if defined(_win_) // On Windows, if 'F_' is console -- 'fwrite' returns count of written characters. @@ -363,7 +363,7 @@ namespace { } } - void DoFlush() override { + void DoFlush() override { if (fflush(F_) != 0) { ythrow TSystemError() << "fflush failed"; } @@ -380,7 +380,7 @@ namespace { { } - ~TStdErr() override = default; + ~TStdErr() override = default; }; struct TStdOut: public TStdOutput { @@ -389,7 +389,7 @@ namespace { { } - ~TStdOut() override = default; + ~TStdOut() override = default; }; TStdOut Out; diff --git a/util/stream/output.h b/util/stream/output.h index 00eef50b95..847e96ae2b 100644 --- a/util/stream/output.h +++ b/util/stream/output.h @@ -42,7 +42,7 @@ public: { } - inline ~TPart() = default; + inline ~TPart() = default; static inline TPart CrLf() noexcept { return TPart("\r\n", 2); diff --git a/util/stream/pipe.cpp b/util/stream/pipe.cpp index 51be1934a7..1a137d868c 100644 --- a/util/stream/pipe.cpp +++ b/util/stream/pipe.cpp @@ -36,7 +36,7 @@ TPipeBase::TPipeBase(const TString& command, const char* mode) { } -TPipeBase::~TPipeBase() = default; +TPipeBase::~TPipeBase() = default; TPipeInput::TPipeInput(const TString& command) : TPipeBase(command, "r") @@ -98,7 +98,7 @@ TPipedInput::TPipedInput(PIPEHANDLE fd) { } -TPipedInput::~TPipedInput() = default; +TPipedInput::~TPipedInput() = default; size_t TPipedInput::DoRead(void* buf, size_t len) { if (!Handle_.IsOpen()) { @@ -112,7 +112,7 @@ TPipedOutput::TPipedOutput(PIPEHANDLE fd) { } -TPipedOutput::~TPipedOutput() = default; +TPipedOutput::~TPipedOutput() = default; void TPipedOutput::DoWrite(const void* buf, size_t len) { if (!Handle_.IsOpen() || static_cast<ssize_t>(len) != Handle_.Write(buf, len)) { diff --git a/util/stream/pipe.h b/util/stream/pipe.h index 18525b9517..544155462b 100644 --- a/util/stream/pipe.h +++ b/util/stream/pipe.h @@ -48,7 +48,7 @@ public: TPipeInput(const TString& command); private: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; }; /** @@ -73,7 +73,7 @@ public: void Close(); private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; class TPipedBase { @@ -94,7 +94,7 @@ public: ~TPipedInput() override; private: - size_t DoRead(void* buf, size_t len) override; + size_t DoRead(void* buf, size_t len) override; }; /** @@ -106,7 +106,7 @@ public: ~TPipedOutput() override; private: - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; }; /** @} */ diff --git a/util/stream/str.cpp b/util/stream/str.cpp index 13f0e8ef28..09ef0b911e 100644 --- a/util/stream/str.cpp +++ b/util/stream/str.cpp @@ -2,7 +2,7 @@ static constexpr size_t MIN_BUFFER_GROW_SIZE = 16; -TStringInput::~TStringInput() = default; +TStringInput::~TStringInput() = default; size_t TStringInput::DoNext(const void** ptr, size_t len) { len = Min(len, S_->size() - Pos_); @@ -16,7 +16,7 @@ void TStringInput::DoUndo(size_t len) { Pos_ -= len; } -TStringOutput::~TStringOutput() = default; +TStringOutput::~TStringOutput() = default; size_t TStringOutput::DoNext(void** ptr) { if (S_->size() == S_->capacity()) { @@ -41,4 +41,4 @@ void TStringOutput::DoWriteC(char c) { S_->push_back(c); } -TStringStream::~TStringStream() = default; +TStringStream::~TStringStream() = default; diff --git a/util/stream/str.h b/util/stream/str.h index 028bd572c0..f75bbce887 100644 --- a/util/stream/str.h +++ b/util/stream/str.h @@ -48,7 +48,7 @@ public: } protected: - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; void DoUndo(size_t len) override; private: @@ -97,7 +97,7 @@ public: protected: size_t DoNext(void** ptr) override; void DoUndo(size_t len) override; - void DoWrite(const void* buf, size_t len) override; + void DoWrite(const void* buf, size_t len) override; void DoWriteC(char c) override; private: diff --git a/util/stream/tee.cpp b/util/stream/tee.cpp index 99873b95ba..1057ea06e3 100644 --- a/util/stream/tee.cpp +++ b/util/stream/tee.cpp @@ -6,7 +6,7 @@ TTeeOutput::TTeeOutput(IOutputStream* l, IOutputStream* r) noexcept { } -TTeeOutput::~TTeeOutput() = default; +TTeeOutput::~TTeeOutput() = default; void TTeeOutput::DoWrite(const void* buf, size_t len) { L_->Write(buf, len); diff --git a/util/stream/tee.h b/util/stream/tee.h index c69e232fb9..de47e57d17 100644 --- a/util/stream/tee.h +++ b/util/stream/tee.h @@ -16,9 +16,9 @@ public: ~TTeeOutput() override; private: - void DoWrite(const void* buf, size_t len) override; - void DoFlush() override; - void DoFinish() override; + void DoWrite(const void* buf, size_t len) override; + void DoFlush() override; + void DoFinish() override; private: IOutputStream* L_; diff --git a/util/stream/tempbuf.h b/util/stream/tempbuf.h index a6dc001025..f14d8ebf01 100644 --- a/util/stream/tempbuf.h +++ b/util/stream/tempbuf.h @@ -17,5 +17,5 @@ public: TTempBufOutput& operator=(TTempBufOutput&&) noexcept = default; protected: - void DoWrite(const void* data, size_t len) override; + void DoWrite(const void* data, size_t len) override; }; diff --git a/util/stream/tokenizer.h b/util/stream/tokenizer.h index b2398efdd1..4693b0174d 100644 --- a/util/stream/tokenizer.h +++ b/util/stream/tokenizer.h @@ -39,7 +39,7 @@ public: { } - inline ~TIterator() = default; + inline ~TIterator() = default; inline void operator++() { Next(); diff --git a/util/stream/walk.h b/util/stream/walk.h index 7e62cb44dc..ee0fe6925b 100644 --- a/util/stream/walk.h +++ b/util/stream/walk.h @@ -17,7 +17,7 @@ public: protected: void DoUndo(size_t len) override; - size_t DoNext(const void** ptr, size_t len) override; + size_t DoNext(const void** ptr, size_t len) override; /** * Returns the next data chunk from this input stream. There are no diff --git a/util/stream/walk_ut.cpp b/util/stream/walk_ut.cpp index e0a783799f..a458c68bbf 100644 --- a/util/stream/walk_ut.cpp +++ b/util/stream/walk_ut.cpp @@ -11,7 +11,7 @@ public: } protected: - size_t DoUnboundedNext(const void** ptr) override { + size_t DoUnboundedNext(const void** ptr) override { if (Index_ >= Data_.size()) { return 0; } diff --git a/util/stream/zerocopy.h b/util/stream/zerocopy.h index 3315aa3a51..9130c8dd5e 100644 --- a/util/stream/zerocopy.h +++ b/util/stream/zerocopy.h @@ -50,8 +50,8 @@ public: } protected: - size_t DoRead(void* buf, size_t len) override; - size_t DoSkip(size_t len) override; + size_t DoRead(void* buf, size_t len) override; + size_t DoSkip(size_t len) override; ui64 DoReadAll(IOutputStream& out) override; virtual size_t DoNext(const void** ptr, size_t len) = 0; }; diff --git a/util/stream/zlib.cpp b/util/stream/zlib.cpp index 60f4e9439f..2fc4188de9 100644 --- a/util/stream/zlib.cpp +++ b/util/stream/zlib.cpp @@ -26,7 +26,7 @@ namespace { memset(Z(), 0, sizeof(*Z())); } - inline ~TZLibCommon() = default; + inline ~TZLibCommon() = default; inline const char* GetErrMsg() const noexcept { return Z()->msg != nullptr ? Z()->msg : "unknown error"; @@ -170,10 +170,10 @@ namespace { { } - ~TDecompressStream() override = default; + ~TDecompressStream() override = default; private: - size_t DoNext(const void** ptr, size_t len) override { + size_t DoNext(const void** ptr, size_t len) override { void* buf = AdditionalData(); *ptr = buf; @@ -332,7 +332,7 @@ void TZLibDecompress::SetAllowMultipleStreams(bool allowMultipleStreams) { Impl_->SetAllowMultipleStreams(allowMultipleStreams); } -TZLibDecompress::~TZLibDecompress() = default; +TZLibDecompress::~TZLibDecompress() = default; size_t TZLibDecompress::DoRead(void* buf, size_t size) { return Impl_->Read(buf, MaxPortion(size)); @@ -377,4 +377,4 @@ void TZLibCompress::DoFinish() { } } -TBufferedZLibDecompress::~TBufferedZLibDecompress() = default; +TBufferedZLibDecompress::~TBufferedZLibDecompress() = default; diff --git a/util/stream/zlib.h b/util/stream/zlib.h index e7de7c81b7..3487858dac 100644 --- a/util/stream/zlib.h +++ b/util/stream/zlib.h @@ -65,7 +65,7 @@ public: ~TZLibDecompress() override; protected: - size_t DoRead(void* buf, size_t size) override; + size_t DoRead(void* buf, size_t size) override; public: class TImpl; @@ -138,9 +138,9 @@ public: private: void Init(const TParams& opts); - void DoWrite(const void* buf, size_t size) override; - void DoFlush() override; - void DoFinish() override; + void DoWrite(const void* buf, size_t size) override; + void DoFlush() override; + void DoFinish() override; public: class TImpl; |