wsd: minor cleanup of send-frame members

Change-Id: Ic2268780ea815611bf978c0c779ef737facc73fb
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>

1 files changed, 12 insertions, 3 deletions

diff --git a/common/Session.hpp b/common/Session.hpp
index 0b9f7f7674..63e47d1246 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -120,12 +120,21 @@ public:
     template <std::size_t N>
     bool sendTextFrame(const char (&buffer)[N])
     {
-        return (buffer != nullptr && N > 0 ? sendTextFrame(buffer, N) : false);
+        static_assert(N > 0, "Cannot have string literal with size zero");
+        return sendTextFrame(buffer, N - 1);
     }
 
     bool sendTextFrame(const char* buffer)
     {
-        return (buffer != nullptr ? sendTextFrame(buffer, std::strlen(buffer)) : false);
+        return buffer != nullptr && sendTextFrame(buffer, std::strlen(buffer));
+    }
+
+    template <std::size_t N>
+    bool sendTextFrameAndLogError(const char (&buffer)[N])
+    {
+        static_assert(N > 0, "Cannot have string literal with size zero");
+        LOG_ERR(buffer);
+        return sendTextFrame(buffer, N - 1);
     }
 
     bool sendTextFrameAndLogError(const std::string& text)
@@ -137,7 +146,7 @@ public:
     bool sendTextFrameAndLogError(const char* buffer)
     {
         LOG_ERR(buffer);
-        return (buffer != nullptr ? sendTextFrame(buffer, std::strlen(buffer)) : false);
+        return buffer != nullptr && sendTextFrame(buffer, std::strlen(buffer));
     }
 
     virtual void handleMessage(const std::vector<char> &data) override;