diff options
author | Simon Rettberg | 2016-11-15 12:13:40 +0100 |
---|---|---|
committer | Simon Rettberg | 2016-11-15 12:13:40 +0100 |
commit | eaebc23452813a8709d2bbb4d17fddb1b4f29d91 (patch) | |
tree | 956155fc2fc5b58498a4c494cc59b7adc68bc76a /src/client/net/serverconnection.cpp | |
parent | [server] Rewrite positioning logic of connection frames (diff) | |
download | pvs2-eaebc23452813a8709d2bbb4d17fddb1b4f29d91.tar.gz pvs2-eaebc23452813a8709d2bbb4d17fddb1b4f29d91.tar.xz pvs2-eaebc23452813a8709d2bbb4d17fddb1b4f29d91.zip |
Increase compiler warnings, fix a lot of those instances
- Add explicit casts
- Comment out unused params
- Remove ignored const return types
Diffstat (limited to 'src/client/net/serverconnection.cpp')
-rw-r--r-- | src/client/net/serverconnection.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp index 826cf06..e9cc72c 100644 --- a/src/client/net/serverconnection.cpp +++ b/src/client/net/serverconnection.cpp @@ -110,8 +110,9 @@ void ServerConnection::handleMsg() // Initial challenge request by server emit stateChange(ConnectWindow::AwaitingChallengeResponse); _myChallenge.resize(CHALLENGE_LEN); - for (int i = 0; i < CHALLENGE_LEN; ++i) - _myChallenge[i] = qrand() & 0xff; + for (int i = 0; i < CHALLENGE_LEN; ++i) { + _myChallenge[i] = (char)(qrand() & 0xff); + } QByteArray serverChallenge(_fromServer.getFieldBytes(_CHALLENGE)); _toServer.reset(); _toServer.setField(_ID, _CHALLENGE); @@ -141,13 +142,13 @@ void ServerConnection::handleMsg() return; } emit stateChange(ConnectWindow::LoggingIn); - char *user = getpwuid(getuid())->pw_name; + const char *user = getpwuid(getuid())->pw_name; if (user == NULL || *user == '\0') user = getenv("USER"); if (user == NULL || *user == '\0') user = getenv("USERNAME"); if (user == NULL || *user == '\0') - user = (char*)"Hans Affe"; + user = "Hans Affe"; _toServer.reset(); _toServer.setField(_ID, _LOGIN); _toServer.setField("HOST", QHostInfo::localHostName()); |