R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimizations

Browse Source
This commit is contained in:
Amos 2022-06-08 14:35:44 +02:00
parent d909878624
commit e461412fde
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
r5dev/tier1/NetAdr2.cpp
View File

@ -14,17 +14,17 @@
// Purpose: constructor (use this when string contains <[IP]:PORT>).
// Input : svInAdr -
//-----------------------------------------------------------------------------
CNetAdr2::CNetAdr2(string svInAdr)
CNetAdr2::CNetAdr2(const string& svInAdr)
{
SetIPAndPort(svInAdr);
}
//-----------------------------------------------------------------------------
// Purpose: constructor (expects string format <IPv4/IPv6> <PORT>).
// Input : svInAdr -
// svInPort -
// Input : &svInAdr -
// &svInPort -
//-----------------------------------------------------------------------------
CNetAdr2::CNetAdr2(string svInAdr, string svInPort)
CNetAdr2::CNetAdr2(const string& svInAdr, const string& svInPort)
{
SetIPAndPort(svInAdr, svInPort);
}
@ -43,7 +43,7 @@ CNetAdr2::~CNetAdr2(void)
//-----------------------------------------------------------------------------
void CNetAdr2::SetIP(const string& svInAdr)
{
m_svip = "[" + svInAdr + "]";
m_svip = '[' + svInAdr + ']';
}
//-----------------------------------------------------------------------------
@ -52,7 +52,7 @@ void CNetAdr2::SetIP(const string& svInAdr)
//-----------------------------------------------------------------------------
void CNetAdr2::SetPort(const string& svInPort)
{
m_svip += ":" + svInPort;
m_svip += ':' + svInPort;
}
//-----------------------------------------------------------------------------
@ -217,7 +217,7 @@ string CNetAdr2::GetBase(void) const
// Purpose: removes brackets and port from IP address.
// Input : svInAdr -
//-----------------------------------------------------------------------------
string CNetAdr2::GetBase(string svInAdr) const
string CNetAdr2::GetBase(const string& svInAdr) const
{
static std::regex rx("[^\\[]*.(.*)(\\]).*");
std::smatch smRegexMatches;
@ -337,12 +337,12 @@ vector<string> CNetAdr2::GetParts(void) const
// 000.000.000.000 -> vparts.
if (m_version == netadrversion_t::NA_V4)
{
svDelim = ".";
svDelim = '.';
}
// 0000:0000:0000:0000:0000:0000:0000:0000 -> vparts.
else if (m_version == netadrversion_t::NA_V6)
{
svDelim = ":";
svDelim = ':';
StringReplace(svIpAdr, "::", ":");
}

6
r5dev/tier1/NetAdr2.h
View File

@ -19,8 +19,8 @@ class CNetAdr2
{
public:
CNetAdr2(void) {};
CNetAdr2(string svInAdr);
CNetAdr2(string svInAdr, string svInPort);
CNetAdr2(const string& svInAdr);
CNetAdr2(const string& svInAdr, const string& svInPort);
~CNetAdr2(void);
void SetIP(const string& svInAdr);
@ -39,7 +39,7 @@ public:
netadrtype_t GetType(void) const;
netadrversion_t GetVersion(void) const;
string GetBase(void) const;
string GetBase(string svInAdr) const;
string GetBase(const string& svInAdr) const;
vector<string> GetParts(void) const;
int GetSize(void) const;
int GetFamily(void) const;

6
r5dev/tier1/bitbuf.cpp
View File

@ -299,14 +299,14 @@ int bf_write::GetNumBytesLeft() const
return this->GetNumBitsLeft() >> 3;
}
unsigned char* bf_write::GetData()
unsigned char* bf_write::GetData() const
{
return this->m_pData;
}
const unsigned char* bf_write::GetData() const
const char* bf_write::GetDebugName() const
{
return this->m_pData;
return this->m_pDebugName;
}
bool bf_write::CheckForOverflow(int nBits)

4
r5dev/tier1/bitbuf.h
View File

@ -73,8 +73,8 @@ public:
int GetMaxNumBits() const;
int GetNumBitsLeft() const;
int GetNumBytesLeft() const;
unsigned char* GetData();
const unsigned char* GetData() const;
unsigned char* GetData() const;
const char* GetDebugName() const;
// Has the buffer overflowed?
bool CheckForOverflow(int nBits);