From 1ae525af81481185086fd7dacb82a0f0e680a9ae Mon Sep 17 00:00:00 2001 From: "shine.chen" Date: Mon, 7 Oct 2019 20:47:07 -0700 Subject: [PATCH] refine readData function per selectable base-class change Signed-off-by: shine.chen --- mclagsyncd/mclaglink.cpp | 5 +++-- mclagsyncd/mclaglink.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mclagsyncd/mclaglink.cpp b/mclagsyncd/mclaglink.cpp index 5eeca94700..9455481886 100644 --- a/mclagsyncd/mclaglink.cpp +++ b/mclagsyncd/mclaglink.cpp @@ -640,7 +640,7 @@ int MclagLink::getFd() return m_connection_socket; } -void MclagLink::readData() +uint64_t MclagLink::readData() { mclag_msg_hdr_t *hdr = NULL; size_t msg_len = 0; @@ -715,6 +715,7 @@ void MclagLink::readData() memmove(m_messageBuffer, m_messageBuffer + start, m_pos - start); m_pos = m_pos - (uint32_t)start; - return; + + return 0; } diff --git a/mclagsyncd/mclaglink.h b/mclagsyncd/mclaglink.h index 271f5a9f5a..48aee59f4c 100644 --- a/mclagsyncd/mclaglink.h +++ b/mclagsyncd/mclaglink.h @@ -113,7 +113,7 @@ class MclagLink : public Selectable { void accept(); int getFd() override; - void readData() override; + uint64_t readData() override; /* readMe throws MclagConnectionClosedException when connection is lost */ class MclagConnectionClosedException : public std::exception