ByteArray::find_sequence returns std::pair<bool, std::size_t> instead of just std::size_t, where first bool in pair signalize about search status

Author: w0lek

vpr/src/server/bytearray.h

@@ -42,7 +42,7 @@ class ByteArray : public std::vector<uint8_t> {
         push_back(b);
     }
 
-    std::size_t find_sequence(const char* sequence, std::size_t sequence_size) {
+    std::pair<bool, std::size_t> find_sequence(const char* sequence, std::size_t sequence_size) {
         const std::size_t ssize = size();
         if (ssize >= sequence_size) {
             for (std::size_t i = 0; i <= ssize - sequence_size; ++i) {
@@ -54,11 +54,11 @@ class ByteArray : public std::vector<uint8_t> {
                     }
                 }
                 if (found) {
-                    return i;
+                    return std::make_pair(true, i);
                 }
             }
         }
-        return std::size_t(-1);
+        return std::make_pair(false, 0);
     }
 
     std::string to_string() const {

vpr/src/server/telegrambuffer.cpp

@@ -9,8 +9,8 @@ void TelegramBuffer::append(const ByteArray& bytes) {
 }
 
 bool TelegramBuffer::check_telegram_header_presence() {
-    std::size_t signature_start_index = m_raw_buffer.find_sequence(TelegramHeader::SIGNATURE, TelegramHeader::SIGNATURE_SIZE);
-    if (signature_start_index != std::size_t(-1)) {
+    auto [found, signature_start_index] = m_raw_buffer.find_sequence(TelegramHeader::SIGNATURE, TelegramHeader::SIGNATURE_SIZE);
+    if (found) {
         if (signature_start_index != 0) {
             // discard bytes preceding the header start position.
             m_raw_buffer.erase(m_raw_buffer.begin(), m_raw_buffer.begin() + signature_start_index);