[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp
Tor Lillqvist
tml at collabora.com
Tue Mar 1 15:30:08 UTC 2016
loolwsd/ChildProcessSession.cpp | 2 +-
loolwsd/LOOLBroker.cpp | 8 ++++----
loolwsd/LOOLKit.cpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4f701d5d84afa072ef9549b1e500b1eef1e4beff
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 1 17:28:42 2016 +0200
Avoid aligning equal signs on sequential lines in a few arbitrary places
If we would use such style, we would need to do it consistently.
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index ae22965..7f037b8 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -1080,7 +1080,7 @@ bool ChildProcessSession::keyEvent(const char* /*buffer*/, int /*length*/, Strin
// Don't close LO window!
constexpr auto KEY_CTRL = 0x2000;
- constexpr auto KEY_W = 0x0216;
+ constexpr auto KEY_W = 0x0216;
if (keycode == (KEY_CTRL | KEY_W))
return true;
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 5718304..0ac53c8 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -199,7 +199,7 @@ public:
}
_start = _buffer;
- _end = _buffer + bytes;
+ _end = _buffer + bytes;
}
if ( _start != _end )
@@ -208,7 +208,7 @@ public:
while (_start != _end && byteChar != '\r' && byteChar != '\n')
{
response += byteChar;
- byteChar = *_start++;
+ byteChar = *_start++;
}
if (byteChar == '\r' && *_start == '\n')
@@ -354,7 +354,7 @@ public:
pollPipeBroker.revents = 0;
start = buffer;
- end = buffer;
+ end = buffer;
static const std::string thread_name = "brk_pipe_reader";
@@ -383,7 +383,7 @@ public:
continue;
}
start = buffer;
- end = buffer + bytes;
+ end = buffer + bytes;
}
else
if (pollPipeBroker.revents & (POLLERR | POLLHUP))
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 10d6ed4..6ca626f 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -956,7 +956,7 @@ void lokit_main(const std::string& childRoot,
continue;
}
start = buffer;
- end = buffer + bytes;
+ end = buffer + bytes;
}
else
if (pollPipeBroker.revents & (POLLERR | POLLHUP))
More information about the Libreoffice-commits
mailing list