Skip to content

Commit 138f8b7

Browse files
committed
remove std::vector<TelegramFramePtr> TelegramBuffer::take_telegram_frames()
1 parent c445d93 commit 138f8b7

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

vpr/src/server/telegrambuffer.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ void TelegramBuffer::take_telegram_frames(std::vector<comm::TelegramFramePtr>& r
6565
}
6666
}
6767

68-
std::vector<comm::TelegramFramePtr> TelegramBuffer::take_telegram_frames() {
69-
std::vector<comm::TelegramFramePtr> result;
70-
take_telegram_frames(result);
71-
return result;
72-
}
73-
7468
void TelegramBuffer::take_errors(std::vector<std::string>& errors) {
7569
errors.reserve(errors.size() + m_errors.size());
7670
std::move(std::begin(m_errors), std::end(m_errors), std::back_inserter(errors));

vpr/src/server/telegrambuffer.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@ class TelegramBuffer
5858
*/
5959
void take_telegram_frames(std::vector<TelegramFramePtr>& frames);
6060

61-
/**
62-
* @brief Extracts well-formed telegram frames from the internal byte buffer.
63-
*
64-
* @return std::vector<TelegramFramePtr> A vector containing pointers to the extracted telegram frames.
65-
*/
66-
std::vector<TelegramFramePtr> take_telegram_frames();
67-
6861
/**
6962
* @brief Takes errors from the internal storage.
7063
*

vpr/test/test_server_telegrambuffer.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ TEST_CASE("test_server_telegrambuffer_oneOpened", "[vpr]") {
4040
buff.append(comm::ByteArray{"111"});
4141
buff.append(comm::ByteArray{"222"});
4242

43-
auto frames = buff.take_telegram_frames();
43+
std::vector<comm::TelegramFramePtr> frames;
44+
buff.take_telegram_frames(frames);
4445
REQUIRE(frames.size() == 0);
4546

4647
REQUIRE(std::string_view{buff.data()} == "111222");
@@ -57,7 +58,8 @@ TEST_CASE("test_server_telegrambuffer_notFilledTelegramButWithPrependedRubish",
5758
tBuff.append(rubbish);
5859
tBuff.append(msgHeader.buffer());
5960

60-
auto frames = tBuff.take_telegram_frames();
61+
std::vector<comm::TelegramFramePtr> frames;
62+
tBuff.take_telegram_frames(frames);
6163
REQUIRE(0 == frames.size());
6264

6365
REQUIRE(msgHeader.buffer() == tBuff.data()); // the rubbish prefix fragment will be absent here
@@ -83,7 +85,8 @@ TEST_CASE("test_server_telegrambuffer__oneFinishedOneOpened", "[vpr]")
8385
tBuff.append(t1);
8486
tBuff.append(t2);
8587

86-
auto frames = tBuff.take_telegram_frames();
88+
std::vector<comm::TelegramFramePtr> frames;
89+
tBuff.take_telegram_frames(frames);
8790
REQUIRE(1 == frames.size());
8891

8992
REQUIRE(msgBody1 == frames[0]->body);
@@ -110,7 +113,8 @@ TEST_CASE("test_server_telegrambuffer_twoFinished", "[vpr]")
110113
tBuff.append(t1);
111114
tBuff.append(t2);
112115

113-
auto frames = tBuff.take_telegram_frames();
116+
std::vector<comm::TelegramFramePtr> frames;
117+
tBuff.take_telegram_frames(frames);
114118
REQUIRE(2 == frames.size());
115119

116120
REQUIRE(msgBody1 == frames[0]->body);
@@ -137,7 +141,8 @@ TEST_CASE("test_server_telegrambuffer_clear", "[vpr]")
137141

138142
tBuff.clear();
139143

140-
auto frames = tBuff.take_telegram_frames();
144+
std::vector<comm::TelegramFramePtr> frames;
145+
tBuff.take_telegram_frames(frames);
141146
REQUIRE(0 == frames.size());
142147

143148
REQUIRE(comm::ByteArray{} == tBuff.data());

0 commit comments

Comments
 (0)