[Libreoffice-commits] online.git: 2 commits - common/MessageQueue.cpp net/FakeSocket.cpp

[Libreoffice Gerrit user]

 common/MessageQueue.cpp |    2 ++
 net/FakeSocket.cpp      |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c6c6e8cc467d9d37cb8d043ae00ff5b664ba87fd
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Oct 19 02:00:46 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Oct 19 02:03:32 2018 +0300

    In fakeSocketConnect() log also the fd the corresponding accept returned

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 639b12db0..34b32f41b 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -366,7 +366,7 @@ int fakeSocketConnect(int fd1, int fd2)
 
     assert(pair1.fd[1] == pair1.fd[0] + 1);
 
-    loggingBuffer << "FakeSocket Connect #" << fd1 << " to #" << fd2 << flush();
+    loggingBuffer << "FakeSocket Connect #" << fd1 << " to #" << fd2 << ": #" << pair1.fd[1] << flush();
 
     return 0;
 }
commit b7a42bd9d1f1bbcb94889b80f4ca3fc8a0ba1499
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Oct 19 01:58:51 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Oct 19 02:02:54 2018 +0300

    Add a FIXME

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index 5322db2c3..85f342bf0 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -197,6 +197,8 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
     // the message is "callback <view> <id> ..."
     const std::string& callbackType = tokens[2];
 
+    // FIXME: Good grief, why don't we use the symbolic LOK_CALLBACK_FOO names here? Doing it this
+    // way is somewhat fragile and certainly bad style.
     if (callbackType == "0")        // invalidation
     {
         int msgX, msgY, msgW, msgH, msgPart;