[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - kit/ChildSession.cpp kit/KitHelper.hpp

[Libreoffice Gerrit user]

 kit/ChildSession.cpp |    2 +-
 kit/KitHelper.hpp    |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f6a35eab4f7bcbbbb26d4fc1084d78bc3a19ad76
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Fri Nov 9 08:46:13 2018 -0500
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Feb 25 12:32:25 2019 +0100

    wsd: more informative callback failure error message
    
    Change-Id: I8d84af03be2bd051ec03d12528dd98b245b982d0
    Reviewed-on: https://gerrit.libreoffice.org/67998
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 86c6dfe24..f681fb1fc 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -2142,7 +2142,7 @@ void ChildSession::loKitCallback(const int type, const std::string& payload)
     // we want a compilation-time failure in the debug builds; but ERR in the
     // log in the release ones
     default:
-        LOG_ERR("Unknown callback event (" << type << "): " << payload);
+        LOG_ERR("Unknown callback event (" << LOKitHelper::kitCallbackTypeToString(type) << "): " << payload);
 #endif
     }
 }
diff --git a/kit/KitHelper.hpp b/kit/KitHelper.hpp
index c3ca6dfaa..b6225feda 100644
--- a/kit/KitHelper.hpp
+++ b/kit/KitHelper.hpp
@@ -133,6 +133,7 @@ namespace LOKitHelper
             return "SIGNATURE_STATUS";
        }
 
+        assert(!"Missing LOK_CALLBACK type");
         return std::to_string(type);
     }