aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/shared')
-rw-r--r--src/server/shared/DataStores/DBCStore.h2
-rw-r--r--src/server/shared/Database/Database.cpp2
-rw-r--r--src/server/shared/Database/PreparedStatements.cpp10
-rw-r--r--src/server/shared/Database/PreparedStatements.h8
-rw-r--r--src/server/shared/Database/SqlOperations.cpp4
-rw-r--r--src/server/shared/Database/SqlOperations.h6
-rw-r--r--src/server/shared/Dynamic/ObjectRegistry.h2
-rw-r--r--src/server/shared/Logging/Log.cpp2
-rw-r--r--src/server/shared/Threading/LockedQueue.h4
-rw-r--r--src/server/shared/Utilities/Util.h2
10 files changed, 21 insertions, 21 deletions
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 22c77fadb27..3e448acd13b 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -92,7 +92,7 @@ class DBCStorage
query +=" ORDER BY " + *sql->indexName + " DESC";
query += ";";
-
+
result = WorldDatabase.Query(query.c_str());
if (result)
{
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index e2bfc58d96d..83a9849a075 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -38,7 +38,7 @@
size_t Database::db_count = 0;
-Database::Database() : mMysql(NULL)
+Database::Database() : mMysql(NULL)
{
// before first connection
if (db_count++ == 0)
diff --git a/src/server/shared/Database/PreparedStatements.cpp b/src/server/shared/Database/PreparedStatements.cpp
index 40a910acf9e..ec57a0f90e8 100644
--- a/src/server/shared/Database/PreparedStatements.cpp
+++ b/src/server/shared/Database/PreparedStatements.cpp
@@ -11,12 +11,12 @@ void PreparedStatementHolder::_prepareStatement(const char* name, const char* sq
strcat(query, "'");
strcat(query, sql);
strcat(query, "'");
-
+
DEBUG_LOG("Preparing statement: %s", query);
db->Execute(query);
-
+
delete[] query;
- ++count;
+ ++count;
}
void PreparedStatementHolder::LoadAuthserver(Database *db, uint32 &count)
@@ -41,7 +41,7 @@ void PreparedStatementHolder::PExecute(Database *db, const char *name, const cha
{
// NOTE: if args == NULL, we're crashing here. No need to waste performance on checking;
// devs must make sure they use PExecute for args and Execute for no args.
-
+
const char prefix[] = "EXECUTE ";
size_t querySize = 8 + strlen(name) + 7 + strlen(args) + 1;
char* query = new char[querySize];
@@ -49,7 +49,7 @@ void PreparedStatementHolder::PExecute(Database *db, const char *name, const cha
strcat(query, name);
strcat(query, " USING ");
strcat(query, args);
-
+
DEBUG_LOG("Prepared statement (parsed args): %s", query);
db->Execute(query);
delete[] query;
diff --git a/src/server/shared/Database/PreparedStatements.h b/src/server/shared/Database/PreparedStatements.h
index c19119dcb3d..277d2b833ec 100644
--- a/src/server/shared/Database/PreparedStatements.h
+++ b/src/server/shared/Database/PreparedStatements.h
@@ -10,18 +10,18 @@ class PreparedStatementHolder
void LoadCharacters(Database *db, uint32 &count);
void LoadAuthserver(Database *db, uint32 &count);
void LoadWorldserver(Database *db, uint32 &count);
-
+
///- Executes prepared statement that doesn't require feedback with name $name on database $db
void Execute(Database *db, const char* name);
- ///- Executes prepared statement that doesn't require feedback with name $name and args $args
+ ///- Executes prepared statement that doesn't require feedback with name $name and args $args
///- on database $db
void PExecute(Database *db, const char* name, const char* args);
-
+
///- Executes a prepared statement without args on db $db with name $name and puts the result set in a pointer.
QueryResult_AutoPtr Query(Database* db, const char* name);
///- Executes a prepared statement with args $args on db $db with name $name and put the result set in a pointer.
QueryResult_AutoPtr PQuery(Database* db, const char* name, const char* args);
-
+
private:
void _prepareStatement(const char* name, const char* sql, Database *db, uint32 &count);
diff --git a/src/server/shared/Database/SqlOperations.cpp b/src/server/shared/Database/SqlOperations.cpp
index 785c5cb84e7..33b96a30533 100644
--- a/src/server/shared/Database/SqlOperations.cpp
+++ b/src/server/shared/Database/SqlOperations.cpp
@@ -41,12 +41,12 @@ void SqlTransaction::Execute(Database *db)
m_Mutex.release();
return;
}
-
+
db->DirectExecute("START TRANSACTION");
while (!m_queue.empty())
{
sql = m_queue.front();
-
+
if (!db->DirectExecute(sql))
{
free((void*)const_cast<char*>(sql));
diff --git a/src/server/shared/Database/SqlOperations.h b/src/server/shared/Database/SqlOperations.h
index eb28a2c0790..337790e4c72 100644
--- a/src/server/shared/Database/SqlOperations.h
+++ b/src/server/shared/Database/SqlOperations.h
@@ -135,10 +135,10 @@ class SqlAsyncTask : public ACE_Method_Request
public:
SqlAsyncTask(Database * db, SqlOperation * op) : m_db(db), m_op(op){}
~SqlAsyncTask()
- {
+ {
if (!m_op)
- return;
-
+ return;
+
delete m_op;
m_op = NULL;
}
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index 11052a9f0a7..0d24cc1982e 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -103,7 +103,7 @@ class ObjectRegistry
}
private:
RegistryMapType i_registeredObjects;
-
+
};
#endif
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 563c9593e65..70256375679 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -28,7 +28,7 @@
Log::Log() :
raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
- dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false),
+ dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false),
m_enableLogDBLater(false), m_enableLogDB(false), m_colored(false),
arenaLogFile(NULL)
{
diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h
index ff6056350f3..16889d792be 100644
--- a/src/server/shared/Threading/LockedQueue.h
+++ b/src/server/shared/Threading/LockedQueue.h
@@ -120,14 +120,14 @@ namespace ACE_Based
{
this->_lock.release();
}
-
+
///! Calls pop_front of the queue
void pop_front()
{
ACE_GUARD (LockType, g, this->_lock);
_queue.pop_front();
}
-
+
///! Checks if we're empty or not with locks held
bool empty()
{
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 3edf0c50c61..335982a7c89 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -320,7 +320,7 @@ class HookList
private:
typename std::list<T> m_list;
public:
- HookList<T> & operator+=(T t)
+ HookList<T> & operator+=(T t)
{
m_list.push_back(t);
return *this;