aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2011-09-15 14:08:17 +0200
committerSpp <spp@jorge.gr>2011-09-15 14:12:57 +0200
commitaf05915b9e36497eda8f2f061c29ffee0c8042b6 (patch)
treefa9e603e2a8d90b9842148ee9fa767f475566b67 /src/server/shared
parent9006e4e8dc1c2cbf30303dd2d5e34f3d9a2380a9 (diff)
[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)
Diffstat (limited to 'src/server/shared')
-rwxr-xr-xsrc/server/shared/Configuration/Config.cpp2
-rwxr-xr-xsrc/server/shared/Configuration/Config.h2
-rwxr-xr-xsrc/server/shared/Cryptography/Authentication/AuthCrypt.cpp2
-rwxr-xr-xsrc/server/shared/Cryptography/Authentication/AuthCrypt.h2
-rwxr-xr-xsrc/server/shared/Cryptography/HMACSHA1.cpp4
-rwxr-xr-xsrc/server/shared/Cryptography/HMACSHA1.h4
-rwxr-xr-xsrc/server/shared/Cryptography/SHA1.cpp6
-rwxr-xr-xsrc/server/shared/Cryptography/SHA1.h4
-rwxr-xr-xsrc/server/shared/DataStores/DBCStore.h2
-rwxr-xr-xsrc/server/shared/Database/QueryHolder.cpp2
-rwxr-xr-xsrc/server/shared/Database/QueryResult.h4
-rwxr-xr-xsrc/server/shared/Dynamic/LinkedReference/Reference.h8
-rwxr-xr-xsrc/server/shared/Logging/Log.cpp2
-rwxr-xr-xsrc/server/shared/Packets/ByteBuffer.h4
-rwxr-xr-xsrc/server/shared/Threading/Threading.cpp2
-rwxr-xr-xsrc/server/shared/Threading/Threading.h2
-rwxr-xr-xsrc/server/shared/Utilities/Util.cpp6
-rwxr-xr-xsrc/server/shared/Utilities/Util.h4
18 files changed, 31 insertions, 31 deletions
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp
index 3114d363919..9c3a906cd2b 100755
--- a/src/server/shared/Configuration/Config.cpp
+++ b/src/server/shared/Configuration/Config.cpp
@@ -19,7 +19,7 @@
#include "Config.h"
#include <ace/Configuration_Import_Export.h>
-static bool GetValueHelper(ACE_Configuration_Heap *mConf, const char *name, ACE_TString &result)
+static bool GetValueHelper(ACE_Configuration_Heap* mConf, const char *name, ACE_TString &result)
{
if (!mConf)
return false;
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index 33c0080a06e..fa42bdcfc6c 100755
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -46,7 +46,7 @@ class Config
private:
std::string mFilename;
- ACE_Configuration_Heap *mConf;
+ ACE_Configuration_Heap* mConf;
};
#define sConfig ACE_Singleton<Config, ACE_Null_Mutex>::instance()
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
index 9367c227f74..146f4e992b7 100755
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
@@ -31,7 +31,7 @@ AuthCrypt::~AuthCrypt()
}
-void AuthCrypt::Init(BigNumber *K)
+void AuthCrypt::Init(BigNumber* K)
{
uint8 ServerEncryptionKey[SEED_KEY_SIZE] = { 0xCC, 0x98, 0xAE, 0x04, 0xE8, 0x97, 0xEA, 0xCA, 0x12, 0xDD, 0xC0, 0x93, 0x42, 0x91, 0x53, 0x57 };
HmacHash serverEncryptHmac(SEED_KEY_SIZE, (uint8*)ServerEncryptionKey);
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
index 1a8a7d3b205..0304ef6b69e 100755
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.h
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
@@ -30,7 +30,7 @@ class AuthCrypt
AuthCrypt();
~AuthCrypt();
- void Init(BigNumber *K);
+ void Init(BigNumber* K);
void DecryptRecv(uint8 *, size_t);
void EncryptSend(uint8 *, size_t);
diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp
index aeaf211dd97..5bb837b1544 100755
--- a/src/server/shared/Cryptography/HMACSHA1.cpp
+++ b/src/server/shared/Cryptography/HMACSHA1.cpp
@@ -30,7 +30,7 @@ HmacHash::~HmacHash()
HMAC_CTX_cleanup(&m_ctx);
}
-void HmacHash::UpdateBigNumber(BigNumber *bn)
+void HmacHash::UpdateBigNumber(BigNumber* bn)
{
UpdateData(bn->AsByteArray(), bn->GetNumBytes());
}
@@ -52,7 +52,7 @@ void HmacHash::Finalize()
ASSERT(length == SHA_DIGEST_LENGTH)
}
-uint8 *HmacHash::ComputeHash(BigNumber *bn)
+uint8 *HmacHash::ComputeHash(BigNumber* bn)
{
HMAC_Update(&m_ctx, bn->AsByteArray(), bn->GetNumBytes());
Finalize();
diff --git a/src/server/shared/Cryptography/HMACSHA1.h b/src/server/shared/Cryptography/HMACSHA1.h
index 5f348c6a42b..180ac6f4262 100755
--- a/src/server/shared/Cryptography/HMACSHA1.h
+++ b/src/server/shared/Cryptography/HMACSHA1.h
@@ -32,11 +32,11 @@ class HmacHash
public:
HmacHash(uint32 len, uint8 *seed);
~HmacHash();
- void UpdateBigNumber(BigNumber *bn);
+ void UpdateBigNumber(BigNumber* bn);
void UpdateData(const uint8 *data, int length);
void UpdateData(const std::string &str);
void Finalize();
- uint8 *ComputeHash(BigNumber *bn);
+ uint8 *ComputeHash(BigNumber* bn);
uint8 *GetDigest() { return (uint8*)m_digest; }
int GetLength() const { return SHA_DIGEST_LENGTH; }
private:
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index 99b62425210..6f2c985ddfb 100755
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -40,17 +40,17 @@ void SHA1Hash::UpdateData(const std::string &str)
UpdateData((uint8 const*)str.c_str(), str.length());
}
-void SHA1Hash::UpdateBigNumbers(BigNumber *bn0, ...)
+void SHA1Hash::UpdateBigNumbers(BigNumber* bn0, ...)
{
va_list v;
- BigNumber *bn;
+ BigNumber* bn;
va_start(v, bn0);
bn = bn0;
while (bn)
{
UpdateData(bn->AsByteArray(), bn->GetNumBytes());
- bn = va_arg(v, BigNumber *);
+ bn = va_arg(v, BigNumber* );
}
va_end(v);
}
diff --git a/src/server/shared/Cryptography/SHA1.h b/src/server/shared/Cryptography/SHA1.h
index e239088b154..27e2d3290d0 100755
--- a/src/server/shared/Cryptography/SHA1.h
+++ b/src/server/shared/Cryptography/SHA1.h
@@ -31,8 +31,8 @@ class SHA1Hash
SHA1Hash();
~SHA1Hash();
- void UpdateFinalizeBigNumbers(BigNumber *bn0, ...);
- void UpdateBigNumbers(BigNumber *bn0, ...);
+ void UpdateFinalizeBigNumbers(BigNumber* bn0, ...);
+ void UpdateBigNumbers(BigNumber* bn0, ...);
void UpdateData(const uint8 *dta, int len);
void UpdateData(const std::string &str);
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index bae253f4114..fbf31bb092e 100755
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -94,7 +94,7 @@ class DBCStorage
uint32 sqlRecordCount = 0;
uint32 sqlHighestIndex = 0;
- Field *fields = NULL;
+ Field* fields = NULL;
QueryResult result = QueryResult(NULL);
// Load data from sql
if (sql)
diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp
index f8908e0c62d..b948a92fc5f 100755
--- a/src/server/shared/Database/QueryHolder.cpp
+++ b/src/server/shared/Database/QueryHolder.cpp
@@ -172,7 +172,7 @@ bool SQLQueryHolderTask::Execute()
{
case SQL_ELEMENT_RAW:
{
- char const *sql = data->element.query;
+ char const* sql = data->element.query;
if (sql)
m_holder->SetResult(i, m_conn->Query(sql));
break;
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index 399779fb66f..6dc01076b59 100755
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -40,7 +40,7 @@ class ResultSet
uint64 GetRowCount() const { return m_rowCount; }
uint32 GetFieldCount() const { return m_fieldCount; }
- Field *Fetch() const { return m_currentRow; }
+ Field* Fetch() const { return m_currentRow; }
const Field & operator [] (uint32 index) const
{
ASSERT(index < m_fieldCount);
@@ -48,7 +48,7 @@ class ResultSet
}
protected:
- Field *m_currentRow;
+ Field* m_currentRow;
uint64 m_rowCount;
uint32 m_fieldCount;
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index 87c17ce7738..707f4e7cfa8 100755
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -72,14 +72,14 @@ template <class TO, class FROM> class Reference : public LinkedListElement
}
Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); }
- Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const *) LinkedListElement::next()); }
+ Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const* ) LinkedListElement::next()); }
Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); }
- Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const *) LinkedListElement::prev()); }
+ Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const* ) LinkedListElement::prev()); }
Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); }
- Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_next()); }
+ Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const* ) LinkedListElement::nocheck_next()); }
Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); }
- Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_prev()); }
+ Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const* ) LinkedListElement::nocheck_prev()); }
TO* operator ->() const { return iRefTo; }
TO* getTarget() const { return iRefTo; }
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index a42e89e0b3e..d7222c8564f 100755
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -965,7 +965,7 @@ void Log::outChar(const char * str, ...)
void Log::outCharDump(const char * str, uint32 account_id, uint32 guid, const char * name)
{
- FILE *file = NULL;
+ FILE* file = NULL;
if (m_charLog_Dump_Separate)
{
char fileName[29]; // Max length: name(12) + guid(11) + _.log (5) + \0
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 34bfea019ab..8ad5af56d1a 100755
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -147,14 +147,14 @@ class ByteBuffer
ByteBuffer &operator<<(const std::string &value)
{
- append((uint8 const *)value.c_str(), value.length());
+ append((uint8 const* )value.c_str(), value.length());
append((uint8)0);
return *this;
}
ByteBuffer &operator<<(const char *str)
{
- append((uint8 const *)str, str ? strlen(str) : 0);
+ append((uint8 const* )str, str ? strlen(str) : 0);
append((uint8)0);
return *this;
}
diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp
index 85914994cb1..9b72d0f1499 100755
--- a/src/server/shared/Threading/Threading.cpp
+++ b/src/server/shared/Threading/Threading.cpp
@@ -179,7 +179,7 @@ void Thread::resume()
ACE_THR_FUNC_RETURN Thread::ThreadTask(void * param)
{
- Runnable * _task = (Runnable*)param;
+ Runnable* _task = (Runnable*)param;
_task->run();
// task execution complete, free referecne added at
diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h
index 085659a42ac..0d327d5abaa 100755
--- a/src/server/shared/Threading/Threading.h
+++ b/src/server/shared/Threading/Threading.h
@@ -95,7 +95,7 @@ namespace ACE_Based
ACE_thread_t m_iThreadId;
ACE_hthread_t m_hThreadHandle;
- Runnable * m_task;
+ Runnable* m_task;
typedef ACE_TSS<Thread> ThreadStorage;
//global object - container for Thread class representation of every thread
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 6a78897bbe0..7d3a6f7ed58 100755
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -236,7 +236,7 @@ bool IsIPAddress(char const* ipaddress)
/// create PID file
uint32 CreatePIDFile(const std::string& filename)
{
- FILE * pid_file = fopen (filename.c_str(), "w" );
+ FILE* pid_file = fopen (filename.c_str(), "w" );
if (pid_file == NULL)
return 0;
@@ -474,7 +474,7 @@ bool Utf8FitTo(const std::string& str, std::wstring search)
return true;
}
-void utf8printf(FILE *out, const char *str, ...)
+void utf8printf(FILE* out, const char *str, ...)
{
va_list ap;
va_start(ap, str);
@@ -482,7 +482,7 @@ void utf8printf(FILE *out, const char *str, ...)
va_end(ap);
}
-void vutf8printf(FILE *out, const char *str, va_list* ap)
+void vutf8printf(FILE* out, const char *str, va_list* ap)
{
#if PLATFORM == PLATFORM_WINDOWS
char temp_buf[32*1024];
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 902b6019f0f..9e17c5417fc 100755
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -368,8 +368,8 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension);
bool utf8ToConsole(const std::string& utf8str, std::string& conStr);
bool consoleToUtf8(const std::string& conStr, std::string& utf8str);
bool Utf8FitTo(const std::string& str, std::wstring search);
-void utf8printf(FILE *out, const char *str, ...);
-void vutf8printf(FILE *out, const char *str, va_list* ap);
+void utf8printf(FILE* out, const char *str, ...);
+void vutf8printf(FILE* out, const char *str, va_list* ap);
bool IsIPAddress(char const* ipaddress);
uint32 CreatePIDFile(const std::string& filename);