aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Database
diff options
context:
space:
mode:
authorclick <none@none>2010-09-25 22:03:57 +0200
committerclick <none@none>2010-09-25 22:03:57 +0200
commit461590832aa87d311a3d99640fc4453ea14325c5 (patch)
tree36ad7ee86166f055aff0f6feb585a5bd6ca290aa /src/server/shared/Database
parenta596cae1d9386942c22dfdbf15d3c8856cc85d99 (diff)
Core: Generic cleanup (tab2spaces/whitespace removal)
--HG-- branch : trunk
Diffstat (limited to 'src/server/shared/Database')
-rw-r--r--src/server/shared/Database/DatabaseWorkerPool.h4
-rw-r--r--src/server/shared/Database/Field.h12
-rw-r--r--src/server/shared/Database/Implementation/LoginDatabase.cpp2
-rw-r--r--src/server/shared/Database/QueryHolder.cpp4
-rw-r--r--src/server/shared/Database/QueryResult.cpp4
-rwxr-xr-xsrc/server/shared/Database/QueryResult.h6
6 files changed, 16 insertions, 16 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 2c6afa2e9e2..9a7134eb2ce 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -329,11 +329,11 @@ class DatabaseWorkerPool
m_bundle_conn->Ping();
/// Assuming all worker threads are free, every worker thread will receive 1 ping operation request
- /// If one or more worker threads are busy, the ping operations will not be split evenly, but this doesn't matter
+ /// If one or more worker threads are busy, the ping operations will not be split evenly, but this doesn't matter
/// as the sole purpose is to prevent connections from idling.
for (size_t i = 0; i < m_async_connections.size(); ++i)
Enqueue(new PingOperation);
- }
+ }
private:
unsigned long escape_string(char *to, const char *from, unsigned long length)
diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h
index 04112c12994..df58bafe95e 100644
--- a/src/server/shared/Database/Field.h
+++ b/src/server/shared/Database/Field.h
@@ -30,7 +30,7 @@ class Field
friend class PreparedResultSet;
public:
-
+
bool GetBool() const // Wrapper, actually gets integer
{
return GetUInt8() == 1 ? true : false;
@@ -137,7 +137,7 @@ class Field
return *reinterpret_cast<int32*>(data.value);
return static_cast<int32>(atol((char*)data.value));
}
-
+
uint64 GetUInt64() const
{
if (!data.value)
@@ -233,14 +233,14 @@ class Field
string = "";
return std::string(string, data.length);
}
- return std::string((char*)data.value);
+ return std::string((char*)data.value);
}
-
+
protected:
Field();
~Field();
- struct
+ struct
{
enum_field_types type; // Field type
void* value; // Actual data in memory
@@ -250,7 +250,7 @@ class Field
void SetByteValue(const void* newValue, const size_t newSize, enum_field_types newType, uint32 length);
void SetStructuredValue(char* newValue, enum_field_types newType);
-
+
void CleanUp()
{
delete[] ((char*)data.value);
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp
index 9032cb639d3..5151f72297d 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.cpp
+++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp
@@ -46,6 +46,6 @@ bool LoginDatabaseConnection::Open(const std::string& infoString)
PrepareStatement(LOGIN_GET_ACCIDBYNAME, "SELECT id FROM account WHERE username = ?");
PrepareStatement(LOGIN_GET_NUMCHARSONREALM, "SELECT numchars FROM realmcharacters WHERE realmid = ? AND acctid= ?");
-
+
return true;
}
diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp
index 6c152f478f8..98ac0390de4 100644
--- a/src/server/shared/Database/QueryHolder.cpp
+++ b/src/server/shared/Database/QueryHolder.cpp
@@ -33,7 +33,7 @@ bool SQLQueryHolder::SetQuery(size_t index, const char *sql)
SQLElementData element;
element.type = SQL_ELEMENT_RAW;
element.element.query = strdup(sql);
-
+
SQLResultSetUnion result;
result.qresult = NULL;
@@ -76,7 +76,7 @@ bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatement* stmt)
SQLElementData element;
element.type = SQL_ELEMENT_PREPARED;
element.element.stmt = stmt;
-
+
SQLResultSetUnion result;
result.presult = NULL;
diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp
index a887b1a9a36..d224b33d513 100644
--- a/src/server/shared/Database/QueryResult.cpp
+++ b/src/server/shared/Database/QueryResult.cpp
@@ -53,7 +53,7 @@ m_rowPosition(0)
m_rBind = new MYSQL_BIND[m_fieldCount];
m_isNull = new my_bool[m_fieldCount];
m_length = new unsigned long[m_fieldCount];
-
+
memset(m_isNull, 0, sizeof(my_bool) * m_fieldCount);
memset(m_rBind, 0, sizeof(MYSQL_BIND) * m_fieldCount);
memset(m_length, 0, sizeof(unsigned long) * m_fieldCount);
@@ -219,7 +219,7 @@ void PreparedResultSet::CleanUp()
FreeBindBuffer();
mysql_stmt_free_result(m_stmt);
- delete[] m_rBind;
+ delete[] m_rBind;
}
void PreparedResultSet::FreeBindBuffer()
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index 12478a2fc4a..23edef1913c 100755
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -44,8 +44,8 @@ class ResultSet
Field *Fetch() const { return m_currentRow; }
const Field & operator [] (uint32 index) const
- {
- ASSERT(index < m_fieldCount);
+ {
+ ASSERT(index < m_fieldCount);
return m_currentRow[index];
}
@@ -90,7 +90,7 @@ class PreparedResultSet
uint64 m_rowPosition;
std::vector<Field*> m_rows;
uint32 m_fieldCount;
-
+
private:
MYSQL_BIND* m_rBind;
MYSQL_STMT* m_stmt;