[Libreoffice-commits] online.git: common/IoUtil.cpp Makefile.am
Miklos Vajna
vmiklos at collabora.co.uk
Mon Nov 28 08:11:43 UTC 2016
Makefile.am | 2 +-
common/IoUtil.cpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 752372a2b022ad4a450df61bcc58c978840b9b37
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 28 09:11:11 2016 +0100
IoUtil: remove never read write of 'n'
Change-Id: I2dfd85696b39ae1f1c7bbc33cec544bc04f980ac
diff --git a/Makefile.am b/Makefile.am
index 5f120ad..df8a679 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,7 +193,7 @@ clean-cache cache-clean:
test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
clang-tidy:
- for i in *.cpp; do echo $$i; clang-tidy -header-filter=^$(PWD).* $$i || break; done
+ for i in {common,kit,tools,wsd}/*.cpp; do echo $$i; clang-tidy -header-filter=^$(PWD).* $$i || break; done
# After building loolforkit, set its capabilities as required. Do it
# already after a plain 'make' to allow for testing without
diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index b4751ac..2ee9c84 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -79,7 +79,6 @@ void SocketProcessor(const std::shared_ptr<LOOLWebSocket>& ws,
try
{
payload.resize(payload.capacity());
- n = -1;
n = ws->receiveFrame(payload.data(), payload.size(), flags);
payload.resize(std::max(n, 0));
}
More information about the Libreoffice-commits
mailing list