From 1a99e8a2761f5fb946bb5fea7c9efd34da37f691 Mon Sep 17 00:00:00 2001
From: tastytea
Date: Sat, 11 Jan 2020 22:16:37 +0100
Subject: Made code in Connection::get_new_events() clearer.

---
 src/connection.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/connection.cpp b/src/connection.cpp
index 3a10d14..8512097 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -99,7 +99,8 @@ vector<event_type> Connection::get_new_events()
     vector<event_type> events;
 
     size_t pos{0};
-    while ((pos = buffer.find("event: ")) != string::npos)
+    constexpr string_view search_event{"event: "};
+    while ((pos = buffer.find(search_event)) != string::npos)
     {
         const auto endpos{buffer.find("\n\n", pos)};
         if (endpos == string::npos)
@@ -108,9 +109,10 @@ vector<event_type> Connection::get_new_events()
         }
 
         event_type event;
-        pos += 7;               // Length of "event: ".
+        pos += search_event.size();
         event.type = buffer.substr(pos, buffer.find('\n', pos) - pos);
-        pos = buffer.find("data: ") + 6;
+        constexpr string_view search_data{"data: "};
+        pos = buffer.find(search_data) + search_data.size();
         event.data = buffer.substr(pos, endpos - pos);
         events.push_back(event);
 
-- 
cgit v1.2.3-54-g00ecf