LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-08-13 13:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

WaE: -Werror=unused-parameter

Browse Source 
Change-Id: Icadfcb19ce1fff2b5009d42acf33297cda6e36f2
This commit is contained in:
Tor Lillqvist
2018-11-01 21:29:40 +02:00
parent 9a0decc406
commit f8a0fb4c32
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/FakeSocket.cpp
View File

@ -370,7 +370,7 @@ int fakeSocketConnect(int fd1, int fd2)
return 0; return 0;
} }
int fakeSocketAccept4(int fd, int flags) int fakeSocketAccept4(int fd)
{ {
std::vector<FakeSocketPair>& fds = getFds(); std::vector<FakeSocketPair>& fds = getFds();
std::unique_lock<std::mutex> lock(theMutex); std::unique_lock<std::mutex> lock(theMutex);

2
net/FakeSocket.hpp
View File

@ -34,7 +34,7 @@ int fakeSocketListen(int fd);
int fakeSocketConnect(int fd1, int fd2); int fakeSocketConnect(int fd1, int fd2);
int fakeSocketAccept4(int fd, int flags); int fakeSocketAccept4(int fd);
int fakeSocketPeer(int fd); int fakeSocketPeer(int fd);

2
net/ServerSocket.hpp
View File

@ -69,7 +69,7 @@ public:
socklen_t addrlen = sizeof(clientInfo); socklen_t addrlen = sizeof(clientInfo);
const int rc = ::accept4(getFD(), (struct sockaddr *)&clientInfo, &addrlen, SOCK_NONBLOCK); const int rc = ::accept4(getFD(), (struct sockaddr *)&clientInfo, &addrlen, SOCK_NONBLOCK);
#else #else
const int rc = fakeSocketAccept4(getFD(), SOCK_NONBLOCK); const int rc = fakeSocketAccept4(getFD());
#endif #endif
LOG_DBG("Accepted socket #" << rc << ", creating socket object."); LOG_DBG("Accepted socket #" << rc << ", creating socket object.");
try try

4
test/fakesockettest.cpp
View File

@ -102,8 +102,8 @@ void FakeSocketTest::testBasic()
std::thread t0([&] { std::thread t0([&] {
// Cannot use CPPUNIT_ASSERT here as that throws and this thread has no Cppunit // Cannot use CPPUNIT_ASSERT here as that throws and this thread has no Cppunit
// exception handler. We check below after joining this thread. // exception handler. We check below after joining this thread.
s3 = fakeSocketAccept4(s0, 0); s3 = fakeSocketAccept4(s0);
s4 = fakeSocketAccept4(s0, 0); s4 = fakeSocketAccept4(s0);
}); });
// Connect s1 and s2 to s0 (that is, to the sockets produced by accepting connections to // Connect s1 and s2 to s0 (that is, to the sockets produced by accepting connections to