loolwsd/ChildSession.cpp | 4 ++-- loolwsd/ChildSession.hpp | 2 +- loolwsd/LOOLKit.cpp | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-)
New commits: commit 10737fdeab7031ad4cfc61734d76effe328ecd07 Author: Ashod Nakashian <[email protected]> Date: Fri Aug 12 18:37:10 2016 -0400 loolwsd: payload as std::string Change-Id: Icee8a16fd18489da87e22955f3126851261332e5 Reviewed-on: https://gerrit.libreoffice.org/28120 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp index f70348d..dbc1a5c 100644 --- a/loolwsd/ChildSession.cpp +++ b/loolwsd/ChildSession.cpp @@ -1185,9 +1185,9 @@ bool ChildSession::setPage(const char* /*buffer*/, int /*length*/, StringTokeniz return true; } -void ChildSession::loKitCallback(const int nType, const char *pPayload) +void ChildSession::loKitCallback(const int nType, const std::string& payload) { - auto pNotif = new CallbackNotification(nType, pPayload ? pPayload : "(nil)"); + auto pNotif = new CallbackNotification(nType, payload); _callbackQueue.enqueueNotification(pNotif); } diff --git a/loolwsd/ChildSession.hpp b/loolwsd/ChildSession.hpp index 72b4883..15a2e18 100644 --- a/loolwsd/ChildSession.hpp +++ b/loolwsd/ChildSession.hpp @@ -50,7 +50,7 @@ public: LibreOfficeKitDocument *getLoKitDocument() const { return (_loKitDocument ? _loKitDocument->get() : nullptr); } - void loKitCallback(const int nType, const char* pPayload); + void loKitCallback(const int nType, const std::string& payload); static std::unique_lock<std::recursive_mutex> getLock() { return std::unique_lock<std::recursive_mutex>(Mutex); } diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 6a54fd1..bb0a42a 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -719,9 +719,10 @@ private: static void ViewCallback(const int nType, const char* pPayload, void* pData) { + const std::string payload = pPayload ? pPayload : "(nil)"; Log::trace() << "Document::ViewCallback " << LOKitHelper::kitCallbackTypeToString(nType) - << " [" << (pPayload ? pPayload : "") << "]." << Log::end; + << " [" << payload << "]." << Log::end; Document* self = reinterpret_cast<Document*>(pData); if (self == nullptr) { @@ -756,9 +757,10 @@ private: static void DocumentCallback(const int nType, const char* pPayload, void* pData) { + const std::string payload = pPayload ? pPayload : "(nil)"; Log::trace() << "Document::DocumentCallback " << LOKitHelper::kitCallbackTypeToString(nType) - << " [" << (pPayload ? pPayload : "") << "]." << Log::end; + << " [" << payload << "]." << Log::end; Document* self = reinterpret_cast<Document*>(pData); if (self == nullptr) { @@ -783,7 +785,7 @@ private: auto session = it.second->getSession(); if (session) { - session->loKitCallback(nType, pPayload); + session->loKitCallback(nType, payload); } } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
