Skip to content

Commit

Permalink
Move some methods from .h to .cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
zergtmn committed Aug 3, 2012
1 parent 5e35b51 commit 7d5b808
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 90 deletions.
111 changes: 111 additions & 0 deletions src/shared/ByteBuffer.cpp
@@ -0,0 +1,111 @@
/*
* Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#include "ByteBuffer.h"
#include "Log.h"

void ByteBufferException::PrintPosError() const
{
char const* traceStr;

#ifdef HAVE_ACE_STACK_TRACE_H
ACE_Stack_Trace trace;
traceStr = trace.c_str();
#else
traceStr = NULL;
#endif

sLog.outError(
"Attempted to %s in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD") "
"value with size: " SIZEFMTD "%s%s",
(add ? "put" : "get"), pos, size, esize,
traceStr ? "\n" : "", traceStr ? traceStr : "");
}

void ByteBuffer::print_storage() const
{
if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) // optimize disabled debug output
return;

std::ostringstream ss;
ss << "STORAGE_SIZE: " << size() << "\n";

if (sLog.IsIncludeTime())
ss << " ";

for (size_t i = 0; i < size(); ++i)
ss << uint32(read<uint8>(i)) << " - ";

sLog.outDebug(ss.str().c_str());
}

void ByteBuffer::textlike() const
{
if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) // optimize disabled debug output
return;

std::ostringstream ss;
ss << "STORAGE_SIZE: " << size() << "\n";

if (sLog.IsIncludeTime())
ss << " ";

for (size_t i = 0; i < size(); ++i)
ss << read<uint8>(i);

sLog.outDebug(ss.str().c_str());
}

void ByteBuffer::hexlike() const
{
if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) // optimize disabled debug output
return;

std::ostringstream ss;
ss << "STORAGE_SIZE: " << size() << "\n";

if (sLog.IsIncludeTime())
ss << " ";

size_t j = 1, k = 1;

for (size_t i = 0; i < size(); ++i)
{
if ((i == (j * 8)) && ((i != (k * 16))))
{
ss << "| ";
++j;
}
else if (i == (k * 16))
{
ss << "\n";

if (sLog.IsIncludeTime())
ss << " ";

++k;
++j;
}

char buf[4];
snprintf(buf, 4, "%02X", read<uint8>(i));
ss << buf << " ";
}

sLog.outDebug(ss.str().c_str());
}
94 changes: 4 additions & 90 deletions src/shared/ByteBuffer.h
Expand Up @@ -20,7 +20,6 @@
#define _BYTEBUFFER_H

#include "Common.h"
#include "Log.h"
#include "Utilities/ByteConverter.h"

class ByteBufferException
Expand All @@ -32,23 +31,7 @@ class ByteBufferException
PrintPosError();
}

void PrintPosError() const
{
char const* traceStr;

#ifdef HAVE_ACE_STACK_TRACE_H
ACE_Stack_Trace trace;
traceStr = trace.c_str();
#else
traceStr = NULL;
#endif

sLog.outError(
"Attempted to %s in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD") "
"value with size: " SIZEFMTD "%s%s",
(add ? "put" : "get"), pos, size, esize,
traceStr ? "\n" : "", traceStr ? traceStr : "");
}
void PrintPosError() const;
private:
bool add;
size_t pos;
Expand Down Expand Up @@ -421,78 +404,9 @@ class ByteBuffer
memcpy(&_storage[pos], src, cnt);
}

void print_storage() const
{
if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) // optimize disabled debug output
return;

std::ostringstream ss;
ss << "STORAGE_SIZE: " << size() << "\n";

if (sLog.IsIncludeTime())
ss << " ";

for (size_t i = 0; i < size(); ++i)
ss << uint32(read<uint8>(i)) << " - ";

sLog.outDebug(ss.str().c_str());
}

void textlike() const
{
if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) // optimize disabled debug output
return;

std::ostringstream ss;
ss << "STORAGE_SIZE: " << size() << "\n";

if (sLog.IsIncludeTime())
ss << " ";

for (size_t i = 0; i < size(); ++i)
ss << read<uint8>(i);

sLog.outDebug(ss.str().c_str());
}

void hexlike() const
{
if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) // optimize disabled debug output
return;

std::ostringstream ss;
ss << "STORAGE_SIZE: " << size() << "\n";

if (sLog.IsIncludeTime())
ss << " ";

size_t j = 1, k = 1;

for (size_t i = 0; i < size(); ++i)
{
if ((i == (j * 8)) && ((i != (k * 16))))
{
ss << "| ";
++j;
}
else if (i == (k * 16))
{
ss << "\n";

if (sLog.IsIncludeTime())
ss << " ";

++k;
++j;
}

char buf[4];
snprintf(buf, 4, "%02X", read<uint8>(i));
ss << buf << " ";

}
sLog.outDebug(ss.str().c_str());
}
void print_storage() const;
void textlike() const;
void hexlike() const;

private:
// limited for internal use because can "append" any unexpected type (like pointer and etc) with hard detection problem
Expand Down
1 change: 1 addition & 0 deletions win/VC100/shared.vcxproj
Expand Up @@ -434,6 +434,7 @@
<ClCompile Include="..\..\src\shared\Auth\md5.c" />
<ClCompile Include="..\..\src\shared\Auth\SARC4.cpp" />
<ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
<ClCompile Include="..\..\src\shared\ByteBuffer.cpp" />
<ClCompile Include="..\..\src\shared\Common.cpp" />
<ClCompile Include="..\..\src\shared\Config\Config.cpp" />
<ClCompile Include="..\..\src\shared\Database\Database.cpp" />
Expand Down
3 changes: 3 additions & 0 deletions win/VC100/shared.vcxproj.filters
Expand Up @@ -45,6 +45,9 @@
<ClCompile Include="..\..\src\shared\Database\DBCFileLoader.cpp">
<Filter>Database\DataStores</Filter>
</ClCompile>
<ClCompile Include="..\..\src\shared\ByteBuffer.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="..\..\src\shared\Log.cpp">
<Filter>Log</Filter>
</ClCompile>
Expand Down
4 changes: 4 additions & 0 deletions win/VC90/shared.vcproj
Expand Up @@ -627,6 +627,10 @@
<Filter
Name="Util"
>
<File
RelativePath="..\..\src\shared\ByteBuffer.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\ByteBuffer.h"
>
Expand Down

0 comments on commit 7d5b808

Please sign in to comment.