X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fdb%2Fsqlite3statement.cpp;h=789afb1e9e94e72c2da8b5065fb2bb058745c7e5;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hp=fea3d76849c968adbbee3fb8546e4eae4dad1e04;hpb=9b22dd53fe62e312c1647310b7ec43aa127090af;p=fms.git

diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index fea3d76..789afb1 100644
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -169,8 +169,7 @@ void Statement::Finalize()
 {
 	if(m_statement)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 		m_statementcount[m_statement]--;
 		if(m_statementcount[m_statement]<=0)
 		{
@@ -194,8 +193,7 @@ Statement &Statement::operator=(const Statement &rhs)
 
 		if(m_statement)
 		{
-			//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-			PThread::Guard g(DB::Instance()->m_mutex);
+			Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 			m_statementcount[m_statement]++;
 		}
 	}
@@ -206,8 +204,7 @@ const bool Statement::Reset()
 {
 	if(Valid())
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 		if(sqlite3_reset(m_statement)==SQLITE_OK)
 		{
 			return true;
@@ -227,8 +224,6 @@ const bool Statement::ResultBlob(const int column, void *data, int &length)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		//PThread::Guard g(DB::Instance()->m_mutex);
 		int bloblength=sqlite3_column_bytes(m_statement,column);
 		if(bloblength>length)
 		{
@@ -259,8 +254,6 @@ const bool Statement::ResultDouble(const int column, double &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		//PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_double(m_statement,column);
 		return true;
 	}
@@ -274,8 +267,6 @@ const bool Statement::ResultInt(const int column, int &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		//PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_int(m_statement,column);
 		return true;
 	}
@@ -289,8 +280,6 @@ const bool Statement::ResultNull(const int column)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_column_type(m_statement,column)==SQLITE_NULL)
 		{
 			return true;
@@ -310,8 +299,6 @@ const bool Statement::ResultText(const int column, std::string &result)
 {
 	if(Valid() && column>=0 && column<m_resultcolumncount)
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		//PThread::Guard g(DB::Instance()->m_mutex);
 		const unsigned char *cresult=sqlite3_column_text(m_statement,column);
 		if(cresult)
 		{
@@ -334,8 +321,7 @@ const bool Statement::Step(const bool saveinsertrowid)
 	m_rowreturned=false;
 	if(Valid())
 	{
-		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 		int result=sqlite3_step(m_statement);
 		if(result==SQLITE_OK || result==SQLITE_ROW || result==SQLITE_DONE)
 		{
@@ -362,8 +348,7 @@ const bool Statement::Step(const bool saveinsertrowid)
 
 const bool Statement::Valid()
 {
-	//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-	PThread::Guard g(DB::Instance()->m_mutex);
+	Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
 	return m_statement ? true : false ;
 }