swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-31 00:15:55 -04:00
Code Issues Projects Releases Wiki Activity

parenthases and unused vars

Browse Source
This commit is contained in:
CodeCodon
2015-08-09 01:56:15 -05:00
parent b01c094f43
commit 511fb7ae64
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ChatServer/src/shared/ChatInterface.cpp
-4
View File
@@ -2346,12 +2346,10 @@ void ChatInterface::OnAddInvite(unsigned track, unsigned result, const ChatAvata
AvatarIdSequencePair *pair = (AvatarIdSequencePair *)user;
unsigned sequence = 0;
ChatAvatarId destId;
if (pair)
{
destId = pair->avatar;
sequence = pair->sequence;
delete pair;
pair = NULL;
@@ -2464,12 +2462,10 @@ void ChatInterface::OnRemoveInvite(unsigned track, unsigned result, const ChatAv
AvatarIdSequencePair *pair = (AvatarIdSequencePair *)user;
unsigned sequence = 0;
ChatAvatarId inviteeId;
if (pair)
{
inviteeId = pair->avatar;
sequence = pair->sequence;
delete pair;
pair = NULL;
engine/shared/library/sharedNetwork/src/linux/Address.cpp
+6 -6
View File
@@ -251,9 +251,9 @@ const bool Address::operator == (const Address & rhs) const
*/
const bool Address::operator < (const Address & rhs) const
{
return(addr4->sin_addr.s_addr < rhs.addr4->sin_addr.s_addr ||
addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr &&
addr4->sin_port < rhs.addr4->sin_port);
return((addr4->sin_addr.s_addr < rhs.addr4->sin_addr.s_addr) ||
(addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr &&
addr4->sin_port < rhs.addr4->sin_port));
}
//---------------------------------------------------------------------
@@ -293,9 +293,9 @@ const bool Address::operator != (const Address & rhs) const
*/
const bool Address::operator > (const Address & rhs) const
{
return(addr4->sin_addr.s_addr > rhs.addr4->sin_addr.s_addr ||
addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr &&
addr4->sin_port > rhs.addr4->sin_port);
return((addr4->sin_addr.s_addr > rhs.addr4->sin_addr.s_addr) ||
(addr4->sin_addr.s_addr == rhs.addr4->sin_addr.s_addr &&
addr4->sin_port > rhs.addr4->sin_port));
}
//---------------------------------------------------------------------