diff options
| author | Spp <none@none> | 2010-08-21 20:08:47 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-08-21 20:08:47 +0200 |
| commit | c3343638cb99865e27c916ba3315aa62ad654e81 (patch) | |
| tree | dc90be668561440533d57fe751955408a5c8650b /src/server/shared | |
| parent | 6714feb3ee95fbc2967f7ea11c837d3caac90d3a (diff) | |
Core: Remove lots warnings:
- All "'xxx' will be initialized after 'yyy' when initialized here"
- Some "unused variable"
- Some "enumeration value 'xxx' not handled in switch"
--HG--
branch : trunk
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/DataStores/DBCStore.h | 11 | ||||
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/QueryResult.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/SQLOperation.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/Transaction.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Logging/Log.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/Threading/DelayExecutor.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Threading/Threading.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Utilities/Timer.h | 2 |
9 files changed, 20 insertions, 19 deletions
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index 3e448acd13b..b8e3eff92a5 100644 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -30,7 +30,7 @@ struct SqlDbc int32 indexPos; int32 sqlIndexPos; SqlDbc(const std::string * _filename, const std::string * _format, const std::string * _idname, const char * fmt) - :formatString(_format),sqlIndexPos(0), indexName (_idname) + :formatString(_format), indexName (_idname), sqlIndexPos(0) { // Convert dbc file name to sql table name sqlTableName = *_filename; @@ -44,14 +44,15 @@ struct SqlDbc // Get sql index position DBCFileLoader::GetFormatRecordSize(fmt, &indexPos); - if (indexPos>=0) + if (indexPos >= 0) { - for (int32 x=0; x < formatString->size(); x++) + uint32 uindexPos = uint32(indexPos); + for (uint32 x = 0; x < formatString->size(); ++x) { // Count only fields present in sql if ((*formatString)[x] == FT_SQL_PRESENT) { - if (x == indexPos) + if (x == uindexPos) break; ++sqlIndexPos; } @@ -65,7 +66,7 @@ class DBCStorage { typedef std::list<char*> StringPoolList; public: - explicit DBCStorage(const char *f) : nCount(0), fieldCount(0), fmt(f), indexTable(NULL), m_dataTable(NULL) { } + explicit DBCStorage(const char *f) : fmt(f), nCount(0), fieldCount(0), indexTable(NULL), m_dataTable(NULL) { } ~DBCStorage() { Clear(); } T const* LookupEntry(uint32 id) const { return (id>=nCount)?NULL:indexTable[id]; } diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 6da629b395e..9fe720bf1d1 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -31,9 +31,9 @@ #include "Timer.h" MySQLConnection::MySQLConnection() : -m_Mysql(NULL), +m_queue(NULL), m_worker(NULL), -m_queue(NULL) +m_Mysql(NULL) { } diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp index 8b0c437b066..dfcb3a94acd 100644 --- a/src/server/shared/Database/QueryResult.cpp +++ b/src/server/shared/Database/QueryResult.cpp @@ -21,9 +21,9 @@ #include "DatabaseEnv.h" QueryResult::QueryResult(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount) -: mResult(result) -, mFieldCount(fieldCount) +: mFieldCount(fieldCount) , mRowCount(rowCount) +, mResult(result) { mCurrentRow = new Field[mFieldCount]; ASSERT(mCurrentRow); diff --git a/src/server/shared/Database/SQLOperation.cpp b/src/server/shared/Database/SQLOperation.cpp index 25da4344c14..b524e962544 100644 --- a/src/server/shared/Database/SQLOperation.cpp +++ b/src/server/shared/Database/SQLOperation.cpp @@ -29,8 +29,8 @@ m_has_result(false) } BasicStatementTask::BasicStatementTask(const char* sql, QueryResultFuture result) : -m_result(result), -m_has_result(true) +m_has_result(true), +m_result(result) { m_sql = strdup(sql); } diff --git a/src/server/shared/Database/Transaction.cpp b/src/server/shared/Database/Transaction.cpp index e9c5d4aeebd..c535afbc542 100644 --- a/src/server/shared/Database/Transaction.cpp +++ b/src/server/shared/Database/Transaction.cpp @@ -29,7 +29,7 @@ void Transaction::PAppend(const char* sql, ...) va_list ap; char szQuery [MAX_QUERY_LEN]; va_start(ap, sql); - int res = vsnprintf(szQuery, MAX_QUERY_LEN, sql, ap); + vsnprintf(szQuery, MAX_QUERY_LEN, sql, ap); va_end(ap); Append(szQuery); diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 70256375679..3856769cbae 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -28,9 +28,9 @@ Log::Log() : raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL), - dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false), - m_enableLogDBLater(false), m_enableLogDB(false), m_colored(false), - arenaLogFile(NULL) + dberLogfile(NULL), chatLogfile(NULL), arenaLogFile(NULL), + m_gmlog_per_account(false), m_enableLogDBLater(false), + m_enableLogDB(false), m_colored(false) { Initialize(); } diff --git a/src/server/shared/Threading/DelayExecutor.cpp b/src/server/shared/Threading/DelayExecutor.cpp index 9a718823232..cfc4987387f 100644 --- a/src/server/shared/Threading/DelayExecutor.cpp +++ b/src/server/shared/Threading/DelayExecutor.cpp @@ -10,7 +10,7 @@ DelayExecutor* DelayExecutor::instance() } DelayExecutor::DelayExecutor() - : activated_(false), pre_svc_hook_(0), post_svc_hook_(0) + : pre_svc_hook_(0), post_svc_hook_(0), activated_(false) { } diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp index 3938286dbdb..7d8da6eee12 100644 --- a/src/server/shared/Threading/Threading.cpp +++ b/src/server/shared/Threading/Threading.cpp @@ -97,12 +97,12 @@ int ThreadPriority::getPriority(Priority p) const #define THREADFLAG (THR_NEW_LWP | THR_SCHED_DEFAULT| THR_JOINABLE) -Thread::Thread() : m_task(0), m_iThreadId(0), m_hThreadHandle(0) +Thread::Thread(): m_iThreadId(0), m_hThreadHandle(0), m_task(0) { } -Thread::Thread(Runnable* instance) : m_task(instance), m_iThreadId(0), m_hThreadHandle(0) +Thread::Thread(Runnable* instance): m_iThreadId(0), m_hThreadHandle(0), m_task(instance) { // register reference to m_task to prevent it deeltion until destructor if (m_task) diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h index 49ddb46fefe..a7b2298b97b 100644 --- a/src/server/shared/Utilities/Timer.h +++ b/src/server/shared/Utilities/Timer.h @@ -182,7 +182,7 @@ struct PeriodicTimer public: PeriodicTimer(int32 period, int32 start_time) - : i_expireTime(start_time), i_period(period) + : i_period(period), i_expireTime(start_time) { } |
