@@ -94,12 +94,12 @@ auto LogConverter::refill_buffer(clp::ReaderInterface* reader)
9494 size_t num_bytes_read{};
9595 // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic)
9696 auto const rc{reader->try_read (
97- m_buffer.data () + m_bytes_occupied ,
98- m_buffer.size () - m_bytes_occupied ,
97+ m_buffer.data () + m_num_bytes_buffered ,
98+ m_buffer.size () - m_num_bytes_buffered ,
9999 num_bytes_read
100100 )};
101101 // NOLINTEND(cppcoreguidelines-pro-bounds-pointer-arithmetic)
102- m_bytes_occupied += num_bytes_read;
102+ m_num_bytes_buffered += num_bytes_read;
103103 if (clp::ErrorCode_EndOfFile == rc) {
104104 return num_bytes_read;
105105 }
@@ -111,19 +111,23 @@ auto LogConverter::refill_buffer(clp::ReaderInterface* reader)
111111}
112112
113113void LogConverter::compact_buffer () {
114- if (0 == m_cur_offset ) {
114+ if (0 == m_parser_offset ) {
115115 return ;
116116 }
117117
118118 // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic)
119- std::memmove (m_buffer.data (), m_buffer.data () + m_cur_offset, m_bytes_occupied - m_cur_offset);
119+ std::memmove (
120+ m_buffer.data (),
121+ m_buffer.data () + m_parser_offset,
122+ m_num_bytes_buffered - m_parser_offset
123+ );
120124 // NOLINTEND(cppcoreguidelines-pro-bounds-pointer-arithmetic)
121- m_bytes_occupied -= m_cur_offset ;
122- m_cur_offset = 0 ;
125+ m_num_bytes_buffered -= m_parser_offset ;
126+ m_parser_offset = 0 ;
123127}
124128
125129auto LogConverter::grow_buffer_if_full () -> ystdlib::error_handling::Result<void> {
126- if (m_buffer.size () != m_bytes_occupied ) {
130+ if (m_buffer.size () != m_num_bytes_buffered ) {
127131 return ystdlib::error_handling::success ();
128132 }
129133
@@ -132,7 +136,7 @@ auto LogConverter::grow_buffer_if_full() -> ystdlib::error_handling::Result<void
132136 return std::errc::result_out_of_range;
133137 }
134138 ystdlib::containers::Array<char > new_buffer (new_size);
135- std::memcpy (new_buffer.data (), m_buffer.data (), m_bytes_occupied );
139+ std::memcpy (new_buffer.data (), m_buffer.data (), m_num_bytes_buffered );
136140 m_buffer = std::move (new_buffer);
137141 return ystdlib::error_handling::success ();
138142}
0 commit comments