X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fdb%2Fsqlite3statement.cpp;h=81df27a419c6421a822f33318ea2425bb0c6d17b;hp=683e771fd1b6779cfe516ecdf61e40c46fb5caef;hb=f60495a029c54358f82956482fe203fe2b7b5b23;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa

diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index 683e771..81df27a 100644
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -65,7 +65,7 @@ const bool Statement::Bind(const int column)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_null(m_statement,column+1)==SQLITE_OK)
 		{
 			return true;
@@ -86,7 +86,7 @@ const bool Statement::Bind(const int column, const int value)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_int(m_statement,column+1,value)==SQLITE_OK)
 		{
 			return true;
@@ -107,7 +107,7 @@ const bool Statement::Bind(const int column, const double value)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_double(m_statement,column+1,value)==SQLITE_OK)
 		{
 			return true;
@@ -127,16 +127,8 @@ const bool Statement::Bind(const int column, const std::string &value)
 {
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
-		//char *text=new char[value.size()+1];
-		//strncpy(text,value.c_str(),value.size());
-		//text[value.size()]=NULL;
-		//textptrs.push_back(text);
-		
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
-		//m_boundtext.push_back(std::vector<char>(value.begin(),value.end()));
-		//if(sqlite3_bind_text(m_statement,column+1,text,value.size(),NULL)==SQLITE_OK)
-		//if(sqlite3_bind_text(m_statement,column+1,&(m_boundtext[m_boundtext.size()-1][0]),(m_boundtext[m_boundtext.size()-1]).size(),NULL)==SQLITE_OK)		
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_text(m_statement,column+1,value.c_str(),value.size(),SQLITE_TRANSIENT)==SQLITE_OK)
 		{
 			return true;
@@ -157,7 +149,7 @@ const bool Statement::Bind(const int column, const void *data, const int length)
 	if(Valid() && column>=0 && column<m_parametercount)
 	{
 		//ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
-		PThread::Guard g(DB::Instance()->m_mutex);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_bind_blob(m_statement,column+1,data,length,SQLITE_TRANSIENT)==SQLITE_OK)
 		{
 			return true;
@@ -236,7 +228,7 @@ 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);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		data=(void *)sqlite3_column_blob(m_statement,column);
 		length=sqlite3_column_bytes(m_statement,column);
 		return true;
@@ -252,7 +244,7 @@ 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);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_double(m_statement,column);
 		return true;
 	}
@@ -267,7 +259,7 @@ 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);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		result=sqlite3_column_int(m_statement,column);
 		return true;
 	}
@@ -282,7 +274,7 @@ 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);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		if(sqlite3_column_type(m_statement,column)==SQLITE_NULL)
 		{
 			return true;
@@ -303,7 +295,7 @@ 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);
+		//PThread::Guard g(DB::Instance()->m_mutex);
 		const unsigned char *cresult=sqlite3_column_text(m_statement,column);
 		if(cresult)
 		{