Simplified STG_LOCKER.

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store_messages.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp
index bccef5aa4a805ae40e9dc0831cacbead6fa4087c..27401e268ff874bdded9fde809e1e5d025395c07 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp
@@ -40,7 +40,7 @@
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::AddMessage(STG_MSG * msg, const std::string & login) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -143,7 +143,7 @@ return 0;
 int POSTGRESQL_STORE::EditMessage(const STG_MSG & msg,
                                   const std::string & login) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -229,7 +229,7 @@ int POSTGRESQL_STORE::GetMessage(uint64_t id,
                                STG_MSG * msg,
                                const std::string &) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -242,7 +242,6 @@ if (PQstatus(connection) != CONNECTION_OK)
         }
     }
 
-std::string login;
 PGresult * result;
 
 if (StartTransaction())
@@ -308,7 +307,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::DelMessage(uint64_t id, const std::string &) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {
@@ -360,7 +359,7 @@ return 0;
 int POSTGRESQL_STORE::GetMessageHdrs(std::vector<STG_MSG_HDR> * hdrsList,
                                    const std::string & login) const
 {
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
 
 if (PQstatus(connection) != CONNECTION_OK)
     {