summaryrefslogtreecommitdiff
path: root/src/net/ipc.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-01 21:21:06 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-01 22:13:44 +0300
commit41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6 (patch)
tree75a934dd456f4079898b77f17fc2e5da631ba761 /src/net/ipc.cpp
parent33ef923235aeabd07308816bb07ef790cc6c1024 (diff)
downloadmanaverse-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.gz
manaverse-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.bz2
manaverse-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.xz
manaverse-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.zip
Fix code style.
Diffstat (limited to 'src/net/ipc.cpp')
-rw-r--r--src/net/ipc.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/net/ipc.cpp b/src/net/ipc.cpp
index 22fbb4ce4..a1bed683a 100644
--- a/src/net/ipc.cpp
+++ b/src/net/ipc.cpp
@@ -28,8 +28,6 @@
#include "utils/sdlhelper.h"
#include "utils/stringutils.h"
-#include <iostream>
-
#include "debug.h"
IPC *ipc = nullptr;
@@ -66,7 +64,7 @@ bool IPC::init()
{
IPaddress ip;
- if(TcpNet::resolveHost(&ip, nullptr, mPort) == -1)
+ if (TcpNet::resolveHost(&ip, nullptr, mPort) == -1)
{
logger->log("IPC: resolveHost error: %s\n", TcpNet::getError());
return false;
@@ -95,7 +93,7 @@ int IPC::acceptLoop(void *ptr)
IPC *const ipc1 = reinterpret_cast<IPC*>(ptr);
const int max_length = 1024;
- TcpNet::SocketSet set = TcpNet::allocSocketSet(1);
+ const TcpNet::SocketSet set = TcpNet::allocSocketSet(1);
TcpNet::addSocket(set, ipc1->mSocket);
ipc->mListen = true;
while (ipc1->mListen)
@@ -104,7 +102,7 @@ int IPC::acceptLoop(void *ptr)
if (!TcpNet::socketReady(ipc1->mSocket))
continue;
- TcpNet::Socket sock = TcpNet::accept(ipc1->mSocket);
+ const TcpNet::Socket sock = TcpNet::accept(ipc1->mSocket);
if (!sock)
{
logger->log_r("IPC: unable to accept connection");
@@ -129,11 +127,11 @@ int IPC::acceptLoop(void *ptr)
ipc1->mThreadLocked = false;
ipc1->mNumReqs ++;
- const std::string resp = strprintf("[%d] %s\n",
+ const std::string resp = strprintf("[%u] %s\n",
ipc1->mNumReqs, req.c_str());
- const char *respc = resp.c_str();
- const int len = strlen(respc) + 1;
+ const char *const respc = resp.c_str();
+ const int len = static_cast<int>(strlen(respc)) + 1;
result = TcpNet::send(sock, respc, len);
if (result < len)
{
@@ -165,13 +163,13 @@ void IPC::start()
unsigned short port(44007);
if (getenv("IPC_PORT"))
- port = atoi(getenv("IPC_PORT"));
+ port = static_cast<unsigned short>(atoi(getenv("IPC_PORT")));
logger->log("Starting IPC...");
ipc = new IPC;
for (int f = port; f < 65535; f ++)
{
- ipc->setPort(f);
+ ipc->setPort(static_cast<unsigned short>(f));
logger->log(" -> trying port %d...", f);
if (ipc->init())
{