From db152e09e9420dbe4a16a47209873d200a90a86b Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Wed, 23 Dec 2020 23:43:03 +0100 Subject: [PATCH] reduce scope of some variables reduce scope of R in Monitor reduce scope of Temp in TCPSendRaw reduce scope of Temp in TCPSend --- src/Network/StatMonitor.cpp | 4 ++-- src/Network/Sync.cpp | 4 ++-- src/Network/TCPHandler.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Network/StatMonitor.cpp b/src/Network/StatMonitor.cpp index 8da50bc..6d810f6 100644 --- a/src/Network/StatMonitor.cpp +++ b/src/Network/StatMonitor.cpp @@ -13,7 +13,7 @@ std::string StatReport; int PPS = 0; void Monitor() { - int R, C = 0, V = 0; + int C = 0, V = 0; if (CI->Clients.empty()) { StatReport = "-"; return; @@ -27,7 +27,7 @@ void Monitor() { if (C == 0 || PPS == 0) { StatReport = "-"; } else { - R = (PPS / C) / V; + int R = (PPS / C) / V; StatReport = std::to_string(R); } PPS = 0; diff --git a/src/Network/Sync.cpp b/src/Network/Sync.cpp index 83dd80c..9b4a231 100644 --- a/src/Network/Sync.cpp +++ b/src/Network/Sync.cpp @@ -16,9 +16,9 @@ #include bool TCPSendRaw(SOCKET C, char* Data, int32_t Size) { - int64_t Sent = 0, Temp; + int64_t Sent = 0; do { - Temp = send(C, &Data[Sent], int(Size - Sent), 0); + int64_t Temp = send(C, &Data[Sent], int(Size - Sent), 0); if (Temp < 1) { info("Socket Closed! " + std::to_string(C)); CloseSocketProper(C); diff --git a/src/Network/TCPHandler.cpp b/src/Network/TCPHandler.cpp index 51ae17f..866dd7e 100644 --- a/src/Network/TCPHandler.cpp +++ b/src/Network/TCPHandler.cpp @@ -17,7 +17,7 @@ bool TCPSend(Client* c, const std::string& Data) { if (c == nullptr) return false; - int32_t Size, Sent, Temp; + int32_t Size, Sent; std::string Send(4, 0); Size = int32_t(Data.size()); memcpy(&Send[0], &Size, sizeof(Size)); @@ -25,7 +25,7 @@ bool TCPSend(Client* c, const std::string& Data) { Sent = 0; Size += 4; do { - Temp = send(c->GetTCPSock(), &Send[Sent], Size - Sent, 0); + int32_t Temp = send(c->GetTCPSock(), &Send[Sent], Size - Sent, 0); if (Temp == 0) { if (c->GetStatus() > -1) c->SetStatus(-1);